From 0d7a527e9743a47b2d56bd01b7f1045ba66a1a64 Mon Sep 17 00:00:00 2001 From: cuu Date: Sat, 1 Dec 2018 20:04:36 +0800 Subject: [PATCH] more translate --- .../10_Settings/Airplane/__init__.py | 13 ++-- .../10_Settings/PowerOptions/__init__.py | 31 +++++---- Menu/GameShell/10_Settings/Update/__init__.py | 69 +++---------------- sys.py/UI/download_process_page.py | 5 +- sys.py/UI/foot_bar.py | 2 +- sys.py/UI/label.py | 1 + sys.py/langs/00_English.ini | 19 +++++ 7 files changed, 58 insertions(+), 82 deletions(-) diff --git a/Menu/GameShell/10_Settings/Airplane/__init__.py b/Menu/GameShell/10_Settings/Airplane/__init__.py index 263a8b5..0725613 100644 --- a/Menu/GameShell/10_Settings/Airplane/__init__.py +++ b/Menu/GameShell/10_Settings/Airplane/__init__.py @@ -19,6 +19,7 @@ from UI.scroller import ListScroller from UI.icon_pool import MyIconPool from UI.icon_item import IconItem from UI.multi_icon_item import MultiIconItem +from UI.lang_manager import MyLangManager from UI.multilabel import MultiLabel @@ -77,9 +78,9 @@ class InfoPageListItem(object): class AirplanePage(Page): - _FootMsg = ["Nav.","Rescue","","Back","Toggle"] + _FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Rescue"),"",MyLangManager.Tr("Back"),MyLangManager.Tr("Toggle")] _MyList = [] - _ListFontObj = fonts["varela13"] + _ListFontObj = MyLangManager.TrFont("varela13") _AList = {} @@ -206,19 +207,19 @@ class AirplanePage(Page): out = commands.getstatusoutput('sudo rfkill list | grep yes | cut -d " " -f3') print out if "yes" in out[1]: - self._Screen._MsgBox.SetText("Turning On") + self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOn")) self._Screen._MsgBox.Draw() commands.getstatusoutput("sudo rfkill unblock all") self._Screen._TitleBar._InAirPlaneMode = False else: - self._Screen._MsgBox.SetText("Turning Off") + self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOff")) self._Screen._MsgBox.Draw() commands.getstatusoutput("sudo rfkill block all") self._Screen._TitleBar._InAirPlaneMode = True def UnBlockAll(self): - self._Screen._MsgBox.SetText("Turning On") + self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOn")) self._Screen._MsgBox.Draw() commands.getstatusoutput("sudo rfkill unblock all") self._Screen._TitleBar._InAirPlaneMode = False @@ -313,7 +314,7 @@ class APIOBJ(object): def Init(self,main_screen): self._Page = AirplanePage() self._Page._Screen = main_screen - self._Page._Name ="Airplane Mode" + self._Page._Name =MyLangManager.Tr("AirplaneMode") self._Page.Init() def API(self,main_screen): diff --git a/Menu/GameShell/10_Settings/PowerOptions/__init__.py b/Menu/GameShell/10_Settings/PowerOptions/__init__.py index 016599f..abbc65a 100644 --- a/Menu/GameShell/10_Settings/PowerOptions/__init__.py +++ b/Menu/GameShell/10_Settings/PowerOptions/__init__.py @@ -20,6 +20,7 @@ from UI.icon_pool import MyIconPool from UI.icon_item import IconItem from UI.multilabel import MultiLabel from UI.skin_manager import MySkinManager +from UI.lang_manager import MyLangManager import config @@ -107,9 +108,9 @@ class PageListItem(object): class InfoPage(Page): - _FootMsg = ["Nav.","","","Back",""] + _FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),""] _MyList = [] - _ListFontObj = fonts["varela15"] + _ListFontObj = MyLangManager.TrFont("varela15") _AList = {} _Time1 = 40 @@ -123,22 +124,22 @@ class InfoPage(Page): m = int(secs/60) s = secs % 60 if m > 1: - min_str = "%d minutes " % m + min_str = "%d "+MyLangManager.Tr("minutes")+" " % m else: - min_str = "%d minute " % m + min_str = "%d "+MyLangManager.Tr("minute")+" " % m if s == 1: - sec_str = "%d second" % s + sec_str = "%d "+MyLangManager.Tr("second") % s elif s > 1: - sec_str = "%d seconds" % s + sec_str = "%d "+MyLangManager.Tr("seconds") % s elif secs > 0: if secs > 1: - sec_str = "%d seconds" % secs + sec_str = "%d "+MyLangManager.Tr("seconds") % secs else: - sec_str = "%d second" % secs + sec_str = "%d "+MyLangManager.Tr("second") % secs elif secs == 0: - sec_str = "Never" + sec_str = MyLangManager.Tr("Never") return min_str + sec_str @@ -156,7 +157,7 @@ class InfoPage(Page): time1 = {} time1["key"] = "time1" if self._Time1 == 0: - time1["value"] = "Never" + time1["value"] = MyLangManager.Tr("Never") else: time1["value"] = "%d secs" % self._Time1 time1["label"] = "Screen dimming" @@ -164,7 +165,7 @@ class InfoPage(Page): time2 = {} time2["key"] = "time2" if self._Time2 == 0: - time2["value"] = "Never" + time2["value"] = MyLangManager.Tr("Never") else: time2["value"] = "%d secs" % self._Time2 @@ -174,7 +175,7 @@ class InfoPage(Page): time3["key"] = "time3" if self._Time3 == 0: - time3["value"] = "Never" + time3["value"] = MyLangManager.Tr("Never") else: time3["value"] = "%d secs" % self._Time3 time3["label"] = "Power OFF" @@ -289,7 +290,7 @@ class InfoPage(Page): i.Draw() class PowerOptionsPage(Page): - _FootMsg = ["Nav.","","Detail","Back","Select"] + _FootMsg = [MyLangManager.Tr("Nav"),"",MyLangManager.Tr("Detail"),MyLangManager.Tr("Back"),MyLangManager.Tr("Select")] _MyList = [] _ListFont = fonts["notosanscjk15"] @@ -449,7 +450,7 @@ class PowerOptionsPage(Page): else: os.system("sudo iw wlan0 set power_save on > /dev/null") - self._Screen._MsgBox.SetText("Applying...") + self._Screen._MsgBox.SetText(MyLangManager.Tr("Applying")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -561,7 +562,7 @@ class APIOBJ(object): def Init(self,main_screen): self._Page = PowerOptionsPage() self._Page._Screen = main_screen - self._Page._Name ="Power Options" + self._Page._Name =MyLangManager.Tr("PowerOptions") self._Page.Init() def API(self,main_screen): diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index 1c0d5d9..003e981 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -20,6 +20,9 @@ from UI.confirm_page import ConfirmPage from UI.download import Download from UI.download_process_page import DownloadProcessPage from UI.skin_manager import MySkinManager +from UI.lang_manager import MyLangManager + +from UI.info_page_list_item import InfoPageListItem from libs.roundrects import aa_round_rect from libs.DBUS import is_wifi_connected_now @@ -60,7 +63,7 @@ class UpdateDownloadPage(DownloadProcessPage): print(filename) os.system("rm -rf %s" % CmdClean(filename)) - self._Screen._MsgBox.SetText("Download failed") + self._Screen._MsgBox.SetText(MyLangManager.Tr("DownloadFailed")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() return False @@ -78,7 +81,7 @@ class UpdateDownloadPage(DownloadProcessPage): self._URL = url self._DST_DIR = dst_dir else: - self._Screen._MsgBox.SetText("Invaid") + self._Screen._MsgBox.SetText(MyLangManager.Tr("Invaid")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() return @@ -120,7 +123,7 @@ class UpdateConfirmPage(ConfirmPage): if self._DownloadPage == None: self._DownloadPage = UpdateDownloadPage() self._DownloadPage._Screen = self._Screen - self._DownloadPage._Name = "Downloading..." + self._DownloadPage._Name = MyLangManager.Tr("Downloading") self._DownloadPage.Init() self._DownloadPage._MD5 = self._MD5 @@ -148,56 +151,6 @@ class UpdateConfirmPage(ConfirmPage): self.Reset() -class InfoPageListItem(object): - _PosX = 0 - _PosY = 0 - _Width = 0 - _Height = 30 - - _Labels = {} - _Icons = {} - _Fonts = {} - - _LinkObj = None - - def __init__(self): - self._Labels = {} - self._Icons = {} - self._Fonts = {} - - def SetSmallText(self,text): - - l = Label() - l._PosX = 40 - l.SetCanvasHWND(self._Parent._CanvasHWND) - l.Init(text,self._Fonts["small"]) - self._Labels["Small"] = l - - def Init(self,text): - - #self._Fonts["normal"] = fonts["veramono12"] - - l = Label() - l._PosX = 10 - l.SetCanvasHWND(self._Parent._CanvasHWND) - - l.Init(text,self._Fonts["normal"]) - self._Labels["Text"] = l - - def Draw(self): - - self._Labels["Text"]._PosY = self._PosY + (self._Height - self._Labels["Text"]._Height)/2 - self._Labels["Text"].Draw() - - if "Small" in self._Labels: - self._Labels["Small"]._PosX = self._Width - self._Labels["Small"]._Width-5 - - self._Labels["Small"]._PosY = self._PosY + (self._Height - self._Labels["Small"]._Height)/2 - self._Labels["Small"].Draw() - - pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) - - class UpdatePage(Page): _Icons = {} _FootMsg = ["Nav.","Check Update","","Back",""] @@ -256,7 +209,7 @@ class UpdatePage(Page): self.GenList() def CheckUpdate(self): - self._Screen._MsgBox.SetText("Checking update...") + self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckingUpdate")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -303,7 +256,7 @@ class UpdatePage(Page): self._Screen.SwapAndShow() else: self._Screen.Draw() - self._Screen._MsgBox.SetText("Launcher is up to date") + self._Screen._MsgBox.SetText(MyLangManager.Tr("LauncherIsUpToDate")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() pygame.time.delay(765) @@ -334,12 +287,12 @@ class UpdatePage(Page): self._Screen.SwapAndShow() else: self._Screen.Draw() - self._Screen._MsgBox.SetText("Checking update failed") + self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckingUpdateFailed")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() else: self._Screen.Draw() - self._Screen._MsgBox.SetText("Please Check your Wi-Fi connection") + self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckWifiConnection")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -360,7 +313,7 @@ class APIOBJ(object): self._UpdatePage = UpdatePage() self._UpdatePage._Screen = main_screen - self._UpdatePage._Name ="Update" + self._UpdatePage._Name =MyLangManager.Tr("Update") self._UpdatePage.Init() def API(self,main_screen): diff --git a/sys.py/UI/download_process_page.py b/sys.py/UI/download_process_page.py index 04a42c4..dfc397e 100644 --- a/sys.py/UI/download_process_page.py +++ b/sys.py/UI/download_process_page.py @@ -20,6 +20,7 @@ from UI.multi_icon_item import MultiIconItem from UI.icon_pool import MyIconPool from UI.download import Download from UI.skin_manager import MySkinManager +from UI.lang_manager import MyLangManager from libs.DBUS import is_wifi_connected_now @@ -130,7 +131,7 @@ class DownloadProcessPage(Page): except: pass - self._Screen._MsgBox.SetText("Download failed") + self._Screen._MsgBox.SetText(MyLangManager.Tr("DownloadFailed")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() return False @@ -163,7 +164,7 @@ class DownloadProcessPage(Page): self._URL = url self._DST_DIR = dst_dir else: - self._Screen._MsgBox.SetText("Invaid") + self._Screen._MsgBox.SetText(MyLangManager.Tr("Invaid")) self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() print("url or dst dir error") diff --git a/sys.py/UI/foot_bar.py b/sys.py/UI/foot_bar.py index 2b1c956..6e717c0 100644 --- a/sys.py/UI/foot_bar.py +++ b/sys.py/UI/foot_bar.py @@ -101,7 +101,7 @@ class FootBar: self._Icons["round_corners"] = round_corners def ResetNavText(self): - self._Icons["nav"]._Label.SetText("Nav.") + self._Icons["nav"]._Label.SetText(MyLangManager.Tr("Nav")) self._State = "normal" self.Draw() return False diff --git a/sys.py/UI/label.py b/sys.py/UI/label.py index 657fd3f..2a52e34 100644 --- a/sys.py/UI/label.py +++ b/sys.py/UI/label.py @@ -9,6 +9,7 @@ from util_funcs import midRect #UI lib from skin_manager import MySkinManager +from lang_manager import MyLangManager class Label: _PosX=0 diff --git a/sys.py/langs/00_English.ini b/sys.py/langs/00_English.ini index 7854951..2b8340f 100644 --- a/sys.py/langs/00_English.ini +++ b/sys.py/langs/00_English.ini @@ -51,3 +51,22 @@ ShutDownConnecting=ShutDownConnecting... Select=Select Detail=Detail Applying=Applying... +DownloadFailed=Download failed +LauncherIsUpToDate=Launcher is up to date +CheckWifiConnection=Please Check your Wi-Fi connection +TurningOn=Turning On +TurningOff=Turning Off +Invalid=Invalid +CheckingUpdate=Checking update... +CheckingUpdateFailed=Cheking update failed +Update=Update +Toggle=Toggle +Rescue=Rescue +AirplaneMode=Airplane Mode +minutes=minutes +seconds=seconds +second=second +minute=minute +Never=Never +PowerOptions=Power Options +