Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit 467ea3f

Browse files
muppet9010muppet9010
committed
change to translation function
1 parent 696ee57 commit 467ea3f

File tree

6 files changed

+35
-27
lines changed

6 files changed

+35
-27
lines changed

‎Source/Currency.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def _SourceRateData(self):
5050
response = request.json()
5151
if not response["success"]:
5252
self.state.RecordActivity(
53-
self.state.translations.currentTexts["Currency WebsiteDownloadFailed"])
53+
self.state.translations.GetTranslation("Currency WebsiteDownloadFailed"))
5454
return False
5555
with open(self.cacheFileName, "w") as file:
5656
file.write(Json.dumps(response))

‎Source/Gui.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ def _CreateRunningBar(self, parent):
4343
self.selectedProfileName.set(configProfileDefault)
4444
else:
4545
self.selectedProfileName.set(
46-
self.translations.currentTexts["Gui SelectProfile"])
46+
self.translations.GetTranslation("Gui SelectProfile"))
4747
self.profileList = TK.OptionMenu(
4848
runningContainer, self.selectedProfileName, *self.sortedProfileNames)
4949
self.profileList.pack(side=TK.LEFT)
5050

5151
self.startButton = TK.Button(runningContainer,
52-
text=self.translations.currentTexts["Gui StartButton"], command=self.state.OnStartButtonHandler)
52+
text=self.translations.GetTranslation("Gui StartButton"), command=self.state.OnStartButtonHandler)
5353
self.startButton.pack(side=TK.LEFT)
5454

5555
self.stopButton = TK.Button(
56-
runningContainer, text=self.translations.currentTexts["Gui StopButton"], command=self.state.OnStopButtonHandler)
56+
runningContainer, text=self.translations.GetTranslation("Gui StopButton"), command=self.state.OnStopButtonHandler)
5757
self.stopButton.pack(side=TK.LEFT)
5858

5959
self.OnStopped()
6060

6161
def _CreateActivityLog(self, parent):
6262
titleFrame = TK.LabelFrame(
63-
parent, text=self.translations.currentTexts["Gui ActivityLogTitle"])
63+
parent, text=self.translations.GetTranslation("Gui ActivityLogTitle"))
6464
titleFrame.pack(fill=TK.BOTH, expand=True, side=TK.TOP, padx=3, pady=3)
6565
yScroll = TK.Scrollbar(titleFrame, orient=TK.VERTICAL)
6666
yScroll.pack(fill=TK.Y, expand=False, side=TK.RIGHT)
@@ -72,7 +72,7 @@ def _CreateBottomBar(self, parent):
7272
self.bottomBarContainer = TK.Frame(parent)
7373
self.bottomBarContainer.pack(fill=TK.X, side=TK.TOP)
7474

75-
quitButton = TK.Button(self.bottomBarContainer, text=self.translations.currentTexts["Gui QuitButton"], fg="red",
75+
quitButton = TK.Button(self.bottomBarContainer, text=self.translations.GetTranslation("Gui QuitButton"), fg="red",
7676
command=self.state.OnQuitButtonHandler)
7777
quitButton.pack(side=TK.LEFT)
7878

‎Source/Rcon.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def TestConnection(self):
1818
except Exception as ex:
1919
self.state.logging.RecordException(ex, "Rcon server test failed")
2020
self.state.RecordActivity(
21-
self.state.translations.currentTexts["Rcon TestErrorMessage"] + str(ex))
21+
self.state.translations.GetTranslation("Rcon TestErrorMessage") + str(ex))
2222
return False
2323

2424
def SendCommand(self, commandString):

‎Source/Streamlabs Rcon Integration.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def Setup(self):
3232
def OnStartButtonHandler(self):
3333
try:
3434
self.logging.DebugLog("Start Button Pressed")
35-
if self.gui.selectedProfileName.get() == "" or self.gui.selectedProfileName.get() == self.translations.currentTexts["Gui SelectProfile"]:
35+
if self.gui.selectedProfileName.get() == "" or self.gui.selectedProfileName.get() == self.translations.GetTranslation("Gui SelectProfile"):
3636
self.RecordActivity(
37-
self.translations.currentTexts["Message NeedProfileBeforeStart"])
37+
self.translations.GetTranslation("Message NeedProfileBeforeStart"))
3838
return
3939
self.profiles.SetCurrentProfile(self.gui.selectedProfileName.get())
4040
self.gui.OnStarted()
@@ -65,7 +65,7 @@ def _OnStartButtonPostStreamlabsConnection(self):
6565
self.streamlabs.connecting = False
6666
self.UpdateStatus()
6767
self.RecordActivity(
68-
self.translations.currentTexts["Message Started"])
68+
self.translations.GetTranslation("Message Started"))
6969
except Exception as ex:
7070
self.logging.RecordException(
7171
ex, "Start Button Post Connection Critical Error")
@@ -84,10 +84,10 @@ def OnStreamlabsDisconnectHandler(self):
8484
self.gui.OnStopped()
8585
if not self.streamlabs.disconnecting:
8686
self.RecordActivity(
87-
self.translations.currentTexts["Message StreamlabsUnexpectedStop"])
87+
self.translations.GetTranslation("Message StreamlabsUnexpectedStop"))
8888
else:
8989
self.RecordActivity(
90-
self.translations.currentTexts["Message Stopped"])
90+
self.translations.GetTranslation("Message Stopped"))
9191
self.streamlabs.disconnecting = False
9292
self.UpdateStatus()
9393
except Exception as ex:
@@ -120,11 +120,11 @@ def OnStreamlabsEventHandler(self, data):
120120
"Streamlabs raw event data: " + str(data))
121121
if not event.IsHandledEvent():
122122
self.RecordActivity(
123-
self.translations.currentTexts["StreamlabsEvent UnrecognisedEvent"] + event.GetEventRawTitlesAsPrettyString())
123+
self.translations.GetTranslation("StreamlabsEvent UnrecognisedEvent") + event.GetEventRawTitlesAsPrettyString())
124124
return
125125
if not event.PopulateNormalisedData():
126126
self.RecordActivity(
127-
self.translations.currentTexts["StreamlabsEvent ErrorProcessingEvent"] + event.GetEventRawTitlesAsPrettyString())
127+
self.translations.GetTranslation("StreamlabsEvent ErrorProcessingEvent") + event.GetEventRawTitlesAsPrettyString())
128128
return
129129
self.logging.DebugLog(
130130
"Streamlabs processed event: " + str(event))
@@ -133,7 +133,7 @@ def OnStreamlabsEventHandler(self, data):
133133
event)
134134
if actionText == None:
135135
self.RecordActivity(
136-
self.translations.currentTexts["StreamlabsEvent NoProfileAction"] + event.GetEventRawTitlesAsPrettyString())
136+
self.translations.GetTranslation("StreamlabsEvent NoProfileAction") + event.GetEventRawTitlesAsPrettyString())
137137
self.logging.DebugLog(
138138
"No profile action for: " + event.GetEventRawTitlesAsPrettyString())
139139
return
@@ -150,13 +150,13 @@ def OnStreamlabsEventHandler(self, data):
150150
except Exception as ex:
151151
self.logging.RecordException(ex, "Rcon event failed")
152152
self.RecordActivity(
153-
self.translations.currentTexts["Rcon CommandError"] + actionText)
153+
self.translations.GetTranslation("Rcon CommandError") + actionText)
154154
return
155155
self.RecordActivity(
156-
self.translations.currentTexts["StreamlabsEvent EventHandled"] + event.GetEventRawTitlesAsPrettyString() + " : " + event.bestName + " : value " + str(event.value) + " : " + actionType)
156+
self.translations.GetTranslation("StreamlabsEvent EventHandled") + event.GetEventRawTitlesAsPrettyString() + " : " + event.bestName + " : value " + str(event.value) + " : " + actionType)
157157
if response != "":
158158
self.RecordActivity(
159-
self.translations.currentTexts["Rcon CommandResponseWarning"] + response)
159+
self.translations.GetTranslation("Rcon CommandResponseWarning") + response)
160160
self.logging.DebugLog("Action done: " + actionText)
161161
except Exception as ex:
162162
self.logging.RecordException(
@@ -165,13 +165,13 @@ def OnStreamlabsEventHandler(self, data):
165165
def UpdateStatus(self):
166166
if self.streamlabs.connecting:
167167
self.gui.UpdateStatusText(
168-
self.translations.currentTexts["Status OBSConnecting"])
168+
self.translations.GetTranslation("Status OBSConnecting"))
169169
elif self.streamlabs.sio.eio.state == "connected":
170170
self.gui.UpdateStatusText(
171-
self.translations.currentTexts["Status Running"])
171+
self.translations.GetTranslation("Status Running"))
172172
else:
173173
self.gui.UpdateStatusText(
174-
self.translations.currentTexts["Status Stopped"])
174+
self.translations.GetTranslation("Status Stopped"))
175175

176176
def Run(self):
177177
self.logging.Log("App Started")

‎Source/StreamlabsEvent.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ def __init__(self, state, data):
3636

3737
if "message" not in data:
3838
self.state.RecordActivity(
39-
self.state.translations.currentTexts["StreamlabsEvent MissingEventPayloadCount"])
39+
self.state.translations.GetTranslation("StreamlabsEvent MissingEventPayloadCount"))
4040
self.errored = True
4141
return
4242
if len(data["message"]) != 1:
4343
self.state.RecordActivity(
44-
self.state.translations.currentTexts["StreamlabsEvent BadEventPayloadCount"] + str(
44+
self.state.translations.GetTranslation("StreamlabsEvent BadEventPayloadCount") + str(
4545
len(data["message"])))
4646
self.errored = True
4747
return
@@ -140,7 +140,7 @@ def PopulateNormalisedData(self):
140140
self.value = 25
141141
else:
142142
self.state.RecordActivity(
143-
self.state.translations.currentTexts["StreamlabsEvent UnrecognisedTwitchSubscriptionType"] + subPlan)
143+
self.state.translations.GetTranslation("StreamlabsEvent UnrecognisedTwitchSubscriptionType") + subPlan)
144144
return False
145145
elif (self.handlerName == "youtube_account-subscription"):
146146
self.valueType = "money"

‎Source/Translations.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
class Translations:
22
def __init__(self, state):
33
self.state = state
4-
language = "en"
5-
self.currentTexts = self.GetLocalisedTexts(language)
4+
self.language = "en"
5+
self.currentTexts = self.LoadLocalisedTexts(self.language)
66

7-
def GetLocalisedTexts(self, language):
7+
def LoadLocalisedTexts(self, language):
88
if language == "en":
99
return {
1010
"Gui SelectProfile": "Select a profile",
@@ -31,3 +31,11 @@ def GetLocalisedTexts(self, language):
3131
"Rcon CommandResponseWarning": "WARNING: Rcon got response from server: ",
3232
"Rcon TestErrorMessage": "Rcon connection test message: "
3333
}
34+
35+
def GetTranslation(self, key):
36+
if key in self.currentTexts.keys():
37+
return self.currentTexts[key]
38+
else:
39+
self.state.logging.Log(
40+
"missing translation in '" + self.language + "': " + key)
41+
return "MISSING KEY"

0 commit comments

Comments
 (0)