Skip to content

Commit 47e804e

Browse files
pniedzielskipniedzielski
committed
Replace lm alias with locale_manager
This patch removes a needless alias for `locale_manager` and uses it directly instead.
1 parent e07ec21 commit 47e804e

5 files changed

Lines changed: 38 additions & 39 deletions

File tree

‎actions/OBSLiveSplitOneCore.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def __init__(self, *args, **kwargs):
1818
self.has_configuration = True
1919

2020
self.status_label = Gtk.Label(
21-
label=self.plugin_base.lm.get("actions.base.status.no-connection"),
21+
label=self.plugin_base.locale_manager.get("actions.base.status.no-connection"),
2222
css_classes=["bold", "red"]
2323
)
2424

@@ -59,28 +59,28 @@ def on_icon_changed(self, event, key, asset):
5959
def get_config_rows(self) -> list:
6060
self.websocket_settings = Adw.PreferencesGroup()
6161
self.websocket_settings.set_title(
62-
self.plugin_base.lm.get("actions.base.websocket-group.title")
62+
self.plugin_base.locale_manager.get("actions.base.websocket-group.title")
6363
)
6464
self.websocket_settings.set_description(
65-
self.plugin_base.lm.get(
65+
self.plugin_base.locale_manager.get(
6666
"actions.base.websocket-group.description"
6767
)
6868
)
6969
self.websocket_settings.set_margin_top(10)
7070
self.websocket_settings.set_margin_bottom(10)
7171

7272
self.ip_entry = Adw.EntryRow(
73-
title=self.plugin_base.lm.get("actions.base.ip.label")
73+
title=self.plugin_base.locale_manager.get("actions.base.ip.label")
7474
)
7575
self.ip_entry.set_show_apply_button(True)
7676
self.websocket_settings.add(self.ip_entry)
7777
self.port_spinner = Adw.SpinRow.new_with_range(0, 65535, 1)
7878
self.port_spinner.set_title(
79-
self.plugin_base.lm.get("actions.base.port.label")
79+
self.plugin_base.locale_manager.get("actions.base.port.label")
8080
)
8181
self.websocket_settings.add(self.port_spinner)
8282
self.password_entry = Adw.PasswordEntryRow(
83-
title=self.plugin_base.lm.get("actions.base.password.label")
83+
title=self.plugin_base.locale_manager.get("actions.base.password.label")
8484
)
8585
self.password_entry.set_show_apply_button(True)
8686
self.websocket_settings.add(self.password_entry)
@@ -167,13 +167,13 @@ def update_status_label(self) -> None:
167167
def _update_status_label(self):
168168
if self.plugin_base.backend.get_connected():
169169
self.status_label.set_label(
170-
self.plugin_base.lm.get("actions.base.status.connected")
170+
self.plugin_base.locale_manager.get("actions.base.status.connected")
171171
)
172172
self.status_label.remove_css_class("red")
173173
self.status_label.add_css_class("green")
174174
else:
175175
self.status_label.set_label(
176-
self.plugin_base.lm.get("actions.base.status.no-connection")
176+
self.plugin_base.locale_manager.get("actions.base.status.no-connection")
177177
)
178178
self.status_label.remove_css_class("green")
179179
self.status_label.add_css_class("red")

‎actions/SetLayoutPath.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ def get_icon_name(self) -> str:
2323
def get_config_rows(self) -> list:
2424
self.layout_path_settings = Adw.PreferencesGroup()
2525
self.layout_path_settings.set_title(
26-
self.plugin_base.lm.get(
26+
self.plugin_base.locale_manager.get(
2727
"actions.set-layout-path.preferences-group.title"
2828
)
2929
)
3030
self.layout_path_settings.set_description(
31-
self.plugin_base.lm.get(
31+
self.plugin_base.locale_manager.get(
3232
"actions.set-layout-path.preferences-group.description"
3333
)
3434
)
3535
self.layout_path_settings.set_margin_top(10)
3636
self.layout_path_settings.set_margin_bottom(10)
3737

3838
self.layout_path_entry = Adw.EntryRow(
39-
title=self.plugin_base.lm.get(
39+
title=self.plugin_base.locale_manager.get(
4040
"actions.set-layout-path.path.label"
4141
)
4242
)
4343
self.layout_path_button = Gtk.Button(
44-
label=self.plugin_base.lm.get(
44+
label=self.plugin_base.locale_manager.get(
4545
"actions.set-layout-path.button.label"
4646
)
4747
)
@@ -50,12 +50,12 @@ def get_config_rows(self) -> list:
5050

5151
self.layout_path_dialog = Gtk.FileDialog()
5252
self.layout_path_dialog.set_title(
53-
self.plugin_base.lm.get(
53+
self.plugin_base.locale_manager.get(
5454
"actions.set-layout-path.dialog.title"
5555
)
5656
)
5757
self.layout_path_dialog.set_accept_label(
58-
self.plugin_base.lm.get(
58+
self.plugin_base.locale_manager.get(
5959
"actions.set-layout-path.dialog.accept.label"
6060
)
6161
)

‎actions/SetSplitsPath.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ def get_icon_name(self) -> str:
2323
def get_config_rows(self) -> list:
2424
self.splits_path_settings = Adw.PreferencesGroup()
2525
self.splits_path_settings.set_title(
26-
self.plugin_base.lm.get(
26+
self.plugin_base.locale_manager.get(
2727
"actions.set-splits-path.preferences-group.title"
2828
)
2929
)
3030
self.splits_path_settings.set_description(
31-
self.plugin_base.lm.get(
31+
self.plugin_base.locale_manager.get(
3232
"actions.set-splits-path.preferences-group.description"
3333
)
3434
)
3535
self.splits_path_settings.set_margin_top(10)
3636
self.splits_path_settings.set_margin_bottom(10)
3737

3838
self.splits_path_entry = Adw.EntryRow(
39-
title=self.plugin_base.lm.get(
39+
title=self.plugin_base.locale_manager.get(
4040
"actions.set-splits-path.path.label"
4141
)
4242
)
4343
self.splits_path_button = Gtk.Button(
44-
label=self.plugin_base.lm.get(
44+
label=self.plugin_base.locale_manager.get(
4545
"actions.set-splits-path.button.label"
4646
)
4747
)
@@ -50,12 +50,12 @@ def get_config_rows(self) -> list:
5050

5151
self.splits_path_dialog = Gtk.FileDialog()
5252
self.splits_path_dialog.set_title(
53-
self.plugin_base.lm.get(
53+
self.plugin_base.locale_manager.get(
5454
"actions.set-splits-path.dialog.title"
5555
)
5656
)
5757
self.splits_path_dialog.set_accept_label(
58-
self.plugin_base.lm.get(
58+
self.plugin_base.locale_manager.get(
5959
"actions.set-splits-path.dialog.accept.label"
6060
)
6161
)

‎actions/TimerSourceActionCore.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ def __init__(self, *args, **kwargs):
2626
def get_config_rows(self) -> list:
2727
self.timer_source_base_settings = Adw.PreferencesGroup()
2828
self.timer_source_base_settings.set_title(
29-
self.plugin_base.lm.get(
29+
self.plugin_base.locale_manager.get(
3030
"actions.timer-source-base.preferences-group.title"
3131
)
3232
)
3333
self.timer_source_base_settings.set_description(
34-
self.plugin_base.lm.get(
34+
self.plugin_base.locale_manager.get(
3535
"actions.timer-source-base.preferences-group.description"
3636
)
3737
)
3838
self.timer_source_base_settings.set_margin_top(10)
3939
self.timer_source_base_settings.set_margin_bottom(10)
4040

4141
self.source_entry = Adw.ComboRow(
42-
title=self.plugin_base.lm.get(
42+
title=self.plugin_base.locale_manager.get(
4343
"actions.timer-source-base.source.label"
4444
)
4545
)

‎main.py‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ def __init__(self):
4141
print("Backend launched")
4242

4343
# Setup locales
44-
self.lm = self.locale_manager
45-
self.lm.set_to_os_default()
44+
self.locale_manager.set_to_os_default()
4645

4746
# Register icons with AssetManager
4847
icon_dir = os.path.join(self.PATH, "assets")
@@ -55,7 +54,7 @@ def __init__(self):
5554

5655
# Register plugin
5756
self.register(
58-
plugin_name = self.lm.get("plugin.name"),
57+
plugin_name = self.locale_manager.get("plugin.name"),
5958
github_repo = "https://github.com/pniedzielski/StreamController-OBSLiveSplitOnePlugin",
6059
plugin_version = "1.2.0",
6160
app_version = "1.5.0-beta"
@@ -66,7 +65,7 @@ def __init__(self):
6665
plugin_base=self,
6766
action_base=Split,
6867
action_id_suffix="Split",
69-
action_name=self.lm.get("actions.split.name"),
68+
action_name=self.locale_manager.get("actions.split.name"),
7069
icon=self._get_action_icon("split"),
7170
action_support={
7271
Input.Key: ActionInputSupport.SUPPORTED,
@@ -80,7 +79,7 @@ def __init__(self):
8079
plugin_base=self,
8180
action_base=Skip,
8281
action_id_suffix="Skip",
83-
action_name=self.lm.get("actions.skip.name"),
82+
action_name=self.locale_manager.get("actions.skip.name"),
8483
icon=self._get_action_icon("skip"),
8584
action_support={
8685
Input.Key: ActionInputSupport.SUPPORTED,
@@ -94,7 +93,7 @@ def __init__(self):
9493
plugin_base=self,
9594
action_base=Undo,
9695
action_id_suffix="Undo",
97-
action_name=self.lm.get("actions.undo.name"),
96+
action_name=self.locale_manager.get("actions.undo.name"),
9897
icon=self._get_action_icon("undo"),
9998
action_support={
10099
Input.Key: ActionInputSupport.SUPPORTED,
@@ -108,7 +107,7 @@ def __init__(self):
108107
plugin_base=self,
109108
action_base=NextComparison,
110109
action_id_suffix="NextComparison",
111-
action_name=self.lm.get("actions.next-comparison.name"),
110+
action_name=self.locale_manager.get("actions.next-comparison.name"),
112111
icon=self._get_action_icon("next-comparison"),
113112
action_support={
114113
Input.Key: ActionInputSupport.SUPPORTED,
@@ -122,7 +121,7 @@ def __init__(self):
122121
plugin_base=self,
123122
action_base=PrevComparison,
124123
action_id_suffix="PrevComparison",
125-
action_name=self.lm.get("actions.prev-comparison.name"),
124+
action_name=self.locale_manager.get("actions.prev-comparison.name"),
126125
icon=self._get_action_icon("prev-comparison"),
127126
action_support={
128127
Input.Key: ActionInputSupport.SUPPORTED,
@@ -136,7 +135,7 @@ def __init__(self):
136135
plugin_base=self,
137136
action_base=ToggleTimingMethod,
138137
action_id_suffix="ToggleTimingMethod",
139-
action_name=self.lm.get("actions.toggle-timing-method.name"),
138+
action_name=self.locale_manager.get("actions.toggle-timing-method.name"),
140139
icon=self._get_action_icon("toggle-timing-method"),
141140
action_support={
142141
Input.Key: ActionInputSupport.SUPPORTED,
@@ -150,7 +149,7 @@ def __init__(self):
150149
plugin_base=self,
151150
action_base=Reset,
152151
action_id_suffix="Reset",
153-
action_name=self.lm.get("actions.reset.name"),
152+
action_name=self.locale_manager.get("actions.reset.name"),
154153
icon=self._get_action_icon("reset"),
155154
action_support={
156155
Input.Key: ActionInputSupport.SUPPORTED,
@@ -164,7 +163,7 @@ def __init__(self):
164163
plugin_base=self,
165164
action_base=Pause,
166165
action_id_suffix="Pause",
167-
action_name=self.lm.get("actions.pause.name"),
166+
action_name=self.locale_manager.get("actions.pause.name"),
168167
icon=self._get_action_icon("pause"),
169168
action_support={
170169
Input.Key: ActionInputSupport.SUPPORTED,
@@ -178,7 +177,7 @@ def __init__(self):
178177
plugin_base=self,
179178
action_base=UndoAllPauses,
180179
action_id_suffix="UndoAllPauses",
181-
action_name=self.lm.get("actions.undo-all-pauses.name"),
180+
action_name=self.locale_manager.get("actions.undo-all-pauses.name"),
182181
icon=self._get_action_icon("undo-all-pauses"),
183182
action_support={
184183
Input.Key: ActionInputSupport.SUPPORTED,
@@ -192,7 +191,7 @@ def __init__(self):
192191
plugin_base=self,
193192
action_base=Interact,
194193
action_id_suffix="Interact",
195-
action_name=self.lm.get("actions.interact.name"),
194+
action_name=self.locale_manager.get("actions.interact.name"),
196195
icon=self._get_action_icon("interact"),
197196
action_support={
198197
Input.Key: ActionInputSupport.SUPPORTED,
@@ -206,7 +205,7 @@ def __init__(self):
206205
plugin_base=self,
207206
action_base=SaveSplits,
208207
action_id_suffix="SaveSplits",
209-
action_name=self.lm.get("actions.save-splits.name"),
208+
action_name=self.locale_manager.get("actions.save-splits.name"),
210209
icon=self._get_action_icon("save-splits"),
211210
action_support={
212211
Input.Key: ActionInputSupport.SUPPORTED,
@@ -220,7 +219,7 @@ def __init__(self):
220219
plugin_base=self,
221220
action_base=SetSplitsPath,
222221
action_id_suffix="SetSplitsPath",
223-
action_name=self.lm.get("actions.set-splits-path.name"),
222+
action_name=self.locale_manager.get("actions.set-splits-path.name"),
224223
icon=self._get_action_icon("set-splits-path"),
225224
action_support={
226225
Input.Key: ActionInputSupport.SUPPORTED,
@@ -234,7 +233,7 @@ def __init__(self):
234233
plugin_base=self,
235234
action_base=SetLayoutPath,
236235
action_id_suffix="SetLayoutPath",
237-
action_name=self.lm.get("actions.set-layout-path.name"),
236+
action_name=self.locale_manager.get("actions.set-layout-path.name"),
238237
icon=self._get_action_icon("set-layout-path"),
239238
action_support={
240239
Input.Key: ActionInputSupport.SUPPORTED,

0 commit comments

Comments
 (0)