continue translate

This commit is contained in:
cuu
2018-12-02 14:12:13 +08:00
parent 0d7a527e97
commit 73bcdb6d44
27 changed files with 198 additions and 105 deletions

View File

@@ -78,7 +78,7 @@ class InfoPageListItem(object):
class AirplanePage(Page):
_FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Rescue"),"",MyLangManager.Tr("Back"),MyLangManager.Tr("Toggle")]
_FootMsg = ["Nav","Rescue","","Back","Toggle"]
_MyList = []
_ListFontObj = MyLangManager.TrFont("varela13")
@@ -207,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(MyLangManager.Tr("TurningOn"))
self._Screen._MsgBox.SetText("TurningOn")
self._Screen._MsgBox.Draw()
commands.getstatusoutput("sudo rfkill unblock all")
self._Screen._TitleBar._InAirPlaneMode = False
else:
self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOff"))
self._Screen._MsgBox.SetText("TurningOff")
self._Screen._MsgBox.Draw()
commands.getstatusoutput("sudo rfkill block all")
self._Screen._TitleBar._InAirPlaneMode = True
def UnBlockAll(self):
self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOn"))
self._Screen._MsgBox.SetText("TurningOn")
self._Screen._MsgBox.Draw()
commands.getstatusoutput("sudo rfkill unblock all")
self._Screen._TitleBar._InAirPlaneMode = False
@@ -314,7 +314,7 @@ class APIOBJ(object):
def Init(self,main_screen):
self._Page = AirplanePage()
self._Page._Screen = main_screen
self._Page._Name =MyLangManager.Tr("AirplaneMode")
self._Page._Name ="Airplane Mode"
self._Page.Init()
def API(self,main_screen):

View File

@@ -94,7 +94,7 @@ class BleInfoPageSelector(PageSelector):
(x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
class BleInfoPage(Page):
_FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Disconnect"),MyLangManager.Tr("Forget"),MyLangManager.Tr("Back"),""]
_FootMsg = ["Nav","Disconnect","Forget","Back",""]
_MyList = []
_ListFontObj = MyLangManager.TrFont("varela15")
_ListSmFontObj = fonts["varela12"] # small font
@@ -127,7 +127,7 @@ class BleInfoPage(Page):
self._ConfirmPage1 = BleForgetConfirmPage()
self._ConfirmPage1._Screen = self._Screen
self._ConfirmPage1._Name = MyLangManager.Tr("ConfirmForget")
self._ConfirmPage1._Name = "ConfirmForget"
self._ConfirmPage1._Parent = self
self._ConfirmPage1.Init()
@@ -205,7 +205,7 @@ class BleInfoPage(Page):
proxy_obj = bus.get_object("org.bluez", self._Path)
dev = dbus.Interface(proxy_obj, "org.bluez.Device1")
self._Screen._MsgBox.SetText(MyLangManager.Tr("Forgeting"))
self._Screen._MsgBox.SetText("Forgeting")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
@@ -230,8 +230,8 @@ class BleInfoPage(Page):
proxy_obj = bus.get_object("org.bluez", self._Path)
dev = dbus.Interface(proxy_obj, "org.bluez.Device1")
self._Screen._FootBar.UpdateNavText(MyLangManager.Tr("Disconnecting"))
self._Screen._MsgBox.SetText(MyLangManager.Tr("Disconnecting"))
self._Screen._FootBar.UpdateNavText("Disconnecting")
self._Screen._MsgBox.SetText("Disconnecting")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
@@ -261,7 +261,7 @@ class BleInfoPage(Page):
if self._AList != None:
if "Connected" in self._AList:
if self._AList["Connected"] == 1:
self._FootMsg[1] = MyLangManager.Tr("Disconnect")
self._FootMsg[1] = "Disconnect"
else:
self._FootMsg[1] = ""
@@ -385,7 +385,7 @@ class BluetoothPage(Page):
_BlockCb = None
_LastStatusMsg = ""
_FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Scan"),MyLangManager.Tr("Info"),MyLangManager.Tr("Back"),MyLangManager.Tr("TryConnect")]
_FootMsg = ["Nav","Scan","Info","Back","TryConnect"]
_Scroller = None
_ListFontObj = fonts["notosanscjk15"]
@@ -444,7 +444,7 @@ class BluetoothPage(Page):
self._InfoPage = BleInfoPage()
self._InfoPage._Screen = self._Screen
self._InfoPage._Name = MyLangManager.Tr("BluetoothInfo")
self._InfoPage._Name = "BluetoothInfo"
self._InfoPage.Init()
def print_normal(self,address, properties):
@@ -530,7 +530,7 @@ class BluetoothPage(Page):
proxy_obj = bus.get_object("org.bluez", cur_li._Path)
dev = dbus.Interface(proxy_obj, "org.bluez.Device1")
self._Screen._FootBar.UpdateNavText(MyLangManager.Tr("Connecting"))
self._Screen._FootBar.UpdateNavText("Connecting")
self.ShowBox(MyLangManager.Tr("Connecting"))
try:
@@ -579,7 +579,7 @@ class BluetoothPage(Page):
self._Scanning = True
self.ShowBox(MyLangManager.Tr("BluetoothScanning"))
self._Screen._FootBar.UpdateNavText(MyLangManager.Tr("Scanning"))
self._Screen._FootBar.UpdateNavText("Scanning")
proxy_obj = self._Dbus.get_object("org.bluez", "/org/bluez/" + self._ADAPTER_DEV)
adapter_props = dbus.Interface(proxy_obj,"org.freedesktop.DBus.Properties")

View File

@@ -8,7 +8,7 @@ import glob
from libs.roundrects import aa_round_rect
## local UI import
from UI.constants import Width,Height,ICON_TYPES,POWEROPT
from UI.constants import Width,Height,ICON_TYPES,RESTARTUI
from UI.page import Page,PageSelector
from UI.label import Label
from UI.fonts import fonts
@@ -75,7 +75,7 @@ class PageListItem(InfoPageListItem):
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 LanguagesPage(Page):
_FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),MyLangManager.Tr("Select")]
_FootMsg = ["Nav","","","Back","Select"]
_MyList = []
_ListFont = fonts["notosanscjk15"]
@@ -105,7 +105,7 @@ class LanguagesPage(Page):
files_path = [os.path.basename(x) for x in sorted(glob.glob('langs/*.ini'))]
for i,u in enumerate( files_path ):
print(i,u)
#print(i,u)
li = PageListItem()
li._Parent = self
li._PosX = start_x
@@ -194,13 +194,13 @@ class LanguagesPage(Page):
with open(".lang","w") as f:
f.write(cur_li._Value)
self._Screen._MsgBox.SetText(MyLangManager.Tr("Applying"))
self._Screen._MsgBox.SetText("Applying")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
MyLangManager.UpdateLang()
##pygame.event.post( pygame.event.Event(RUNEVT, message="exit 0")) ##Restart Launcher
pygame.event.post( pygame.event.Event(RESTARTUI, message="")) ##Restart Launcher
pygame.time.delay(1000)

View File

@@ -22,16 +22,16 @@ 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
from UI.info_page_list_item import InfoPageListItem
from UI.info_page_selector import InfoPageSelector
class NotificationPage(Page):
_FootMsg = ["Nav.","","","Back","Toggle"]
_FootMsg = ["Nav","","","Back","Toggle"]
_MyList = []
_ListFontObj = fonts["varela13"]
_ListFontObj = MyLangManager.TrFont("varela13")
_AList = {}
@@ -197,7 +197,7 @@ class NotificationPage(Page):
if event.key == CurKeys["B"]:
self.ToggleEnable()
self._Screen._MsgBox.SetText("Applying...")
self._Screen._MsgBox.SetText("Applying")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
pygame.time.delay(1000)

View File

@@ -6,14 +6,13 @@ import pygame
from UI.constants import RUNSYS
from UI.keys_def import CurKeys
from UI.confirm_page import ConfirmPage
from UI.lang_manager import MyLangManager
import config
class PowerOffConfirmPage(ConfirmPage):
_ConfirmText = "Confirm Power OFF?"
_ConfirmText = MyLangManager.Tr("Confirm Power OFF?")
def CheckBattery(self):
try:
f = open(config.Battery)

View File

@@ -85,7 +85,7 @@ class PageListItem(object):
l = Label()
l._PosX = 10
l.SetCanvasHWND(self._Parent._CanvasHWND)
text = MyLangManager.Tr(text)
l.Init(text,self._Fonts["normal"])
self._Labels["Text"] = l
@@ -108,7 +108,7 @@ class PageListItem(object):
class InfoPage(Page):
_FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),""]
_FootMsg = ["Nav","","","Back",""]
_MyList = []
_ListFontObj = MyLangManager.TrFont("varela15")
_AList = {}
@@ -124,19 +124,19 @@ class InfoPage(Page):
m = int(secs/60)
s = secs % 60
if m > 1:
min_str = "%d "+MyLangManager.Tr("minutes")+" " % m
min_str = ("%d "+MyLangManager.Tr("minutes")+" ") % m
else:
min_str = "%d "+MyLangManager.Tr("minute")+" " % m
min_str = ("%d "+MyLangManager.Tr("minute")+" ") % m
if s == 1:
sec_str = "%d "+MyLangManager.Tr("second") % s
sec_str = ("%d "+MyLangManager.Tr("second")) % s
elif s > 1:
sec_str = "%d "+MyLangManager.Tr("seconds") % s
sec_str = ("%d "+MyLangManager.Tr("seconds")) % s
elif secs > 0:
if secs > 1:
sec_str = "%d "+MyLangManager.Tr("seconds") % secs
sec_str = ("%d "+MyLangManager.Tr("seconds")) % secs
else:
sec_str = "%d "+MyLangManager.Tr("second") % secs
sec_str = ("%d "+MyLangManager.Tr("second")) % secs
elif secs == 0:
sec_str = MyLangManager.Tr("Never")
@@ -190,17 +190,17 @@ class InfoPage(Page):
start_y = 0
for i,v in enumerate( self._AList):
print(v)
#print(v)
li = PageListItem()
li._Parent = self
li._PosX = start_x
li._PosY = start_y + i*PageListItem._Height
li._Width = Width
li._Fonts["normal"] = self._ListFontObj
li._Fonts["small"] = fonts["varela12"]
li._Fonts["small"] = MyLangManager.TrFont("varela12")
if self._AList[v]["label"] != "":
li.Init( self._AList[v]["label"] )
li.Init( self._AList[v]["label"] )
else:
li.Init( self._AList[v]["key"] )
@@ -290,7 +290,7 @@ class InfoPage(Page):
i.Draw()
class PowerOptionsPage(Page):
_FootMsg = [MyLangManager.Tr("Nav"),"",MyLangManager.Tr("Detail"),MyLangManager.Tr("Back"),MyLangManager.Tr("Select")]
_FootMsg = ["Nav","","Detail","Back","Select"]
_MyList = []
_ListFont = fonts["notosanscjk15"]
@@ -450,7 +450,7 @@ class PowerOptionsPage(Page):
else:
os.system("sudo iw wlan0 set power_save on > /dev/null")
self._Screen._MsgBox.SetText(MyLangManager.Tr("Applying"))
self._Screen._MsgBox.SetText("Applying")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
@@ -562,7 +562,7 @@ class APIOBJ(object):
def Init(self,main_screen):
self._Page = PowerOptionsPage()
self._Page._Screen = main_screen
self._Page._Name =MyLangManager.Tr("PowerOptions")
self._Page._Name ="Power Options"
self._Page.Init()
def API(self,main_screen):

View File

@@ -63,7 +63,7 @@ class UpdateDownloadPage(DownloadProcessPage):
print(filename)
os.system("rm -rf %s" % CmdClean(filename))
self._Screen._MsgBox.SetText(MyLangManager.Tr("DownloadFailed"))
self._Screen._MsgBox.SetText("DownloadFailed")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
return False
@@ -81,7 +81,7 @@ class UpdateDownloadPage(DownloadProcessPage):
self._URL = url
self._DST_DIR = dst_dir
else:
self._Screen._MsgBox.SetText(MyLangManager.Tr("Invaid"))
self._Screen._MsgBox.SetText("Invaid")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
return
@@ -123,7 +123,7 @@ class UpdateConfirmPage(ConfirmPage):
if self._DownloadPage == None:
self._DownloadPage = UpdateDownloadPage()
self._DownloadPage._Screen = self._Screen
self._DownloadPage._Name = MyLangManager.Tr("Downloading")
self._DownloadPage._Name = "Downloading"
self._DownloadPage.Init()
self._DownloadPage._MD5 = self._MD5
@@ -153,7 +153,7 @@ class UpdateConfirmPage(ConfirmPage):
class UpdatePage(Page):
_Icons = {}
_FootMsg = ["Nav.","Check Update","","Back",""]
_FootMsg = ["Nav","Check Update","","Back",""]
_ListFontObj = fonts["varela15"]
_ConfirmPage = None
@@ -209,7 +209,7 @@ class UpdatePage(Page):
self.GenList()
def CheckUpdate(self):
self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckingUpdate"))
self._Screen._MsgBox.SetText("CheckingUpdate")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
@@ -256,7 +256,7 @@ class UpdatePage(Page):
self._Screen.SwapAndShow()
else:
self._Screen.Draw()
self._Screen._MsgBox.SetText(MyLangManager.Tr("LauncherIsUpToDate"))
self._Screen._MsgBox.SetText("LauncherIsUpToDate")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
pygame.time.delay(765)
@@ -287,12 +287,12 @@ class UpdatePage(Page):
self._Screen.SwapAndShow()
else:
self._Screen.Draw()
self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckingUpdateFailed"))
self._Screen._MsgBox.SetText("CheckingUpdateFailed")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
else:
self._Screen.Draw()
self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckWifiConnection"))
self._Screen._MsgBox.SetText("CheckWifiConnection")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
@@ -313,7 +313,7 @@ class APIOBJ(object):
self._UpdatePage = UpdatePage()
self._UpdatePage._Screen = main_screen
self._UpdatePage._Name =MyLangManager.Tr("Update")
self._UpdatePage._Name = "Update"
self._UpdatePage.Init()
def API(self,main_screen):

View File

@@ -16,6 +16,7 @@ from UI.keys_def import CurKeys
from UI.scroller import ListScroller
from UI.confirm_page import ConfirmPage
from UI.skin_manager import MySkinManager
from UI.lang_manager import MyLangManager
from UI.info_page_list_item import InfoPageListItem
from UI.info_page_selector import InfoPageSelector
@@ -26,7 +27,7 @@ import myvars
class WifiDisconnectConfirmPage(ConfirmPage):
_ConfirmText = "Confirm Disconnect?"
_ConfirmText = MyLangManager.Tr("ConfirmDisconnectQ")
def KeyDown(self,event):
if event.key == CurKeys["Menu"] or event.key == CurKeys["A"]:
@@ -35,7 +36,7 @@ class WifiDisconnectConfirmPage(ConfirmPage):
self._Screen.SwapAndShow()
if event.key == CurKeys["B"]:
self.SnapMsg("Disconnecting...")
self.SnapMsg(MyLangManager.Tr("Disconnecting"))
self._Screen.Draw()
self._Screen.SwapAndShow()
@@ -57,9 +58,9 @@ class WifiDisconnectConfirmPage(ConfirmPage):
self.Reset()
class WifiInfoPage(Page):
_FootMsg = ["Nav.","Disconnect","","Back",""]
_FootMsg = ["Nav","Disconnect","","Back",""]
_MyList = []
_ListFontObj = fonts["varela15"]
_ListFontObj = MyLangManager.TrFont("varela15")
_Wireless = None
_Daemon = None
@@ -287,7 +288,7 @@ class WifiList(Page):
_BlockCb = None
_LastStatusMsg = ""
_FootMsg = ["Nav.","Scan","Info","Back","Enter"]
_FootMsg = ["Nav","Scan","Info","Back","Enter"]
_EncMethods = None
_Scroller = None
_ListFontObj = fonts["notosanscjk15"]
@@ -370,7 +371,7 @@ class WifiList(Page):
return
self._Scanning = True
self.ShowBox("Wifi scanning...")
self.ShowBox(MyLangManager.Tr("Wifi scanning"))
self._BlockingUI = True
print("dbus says start scan...")
@@ -537,7 +538,7 @@ class WifiList(Page):
self._Wireless.SetWirelessProperty(netid,"apsk",password)
self._Wireless.SetWirelessProperty(netid,"automatic",1)
self.ShowBox("Connecting...")
self.ShowBox(MyLangManager.Tr("Connecting"))
self._WirelessList[netid].Connect()
print("after Connect")
@@ -620,7 +621,7 @@ class WifiList(Page):
wireless_connecting = self._Wireless.CheckIfWirelessConnecting()
if wireless_connecting:
self.ShutDownConnecting()
self.ShowBox("ShutDownConnecting...")
self.ShowBox(MyLangManager.Tr("ShutDownConnecting"))
self._BlockingUI=True
self._BlockCb = self.AbortedAndReturnToUpLevel
else:

View File

@@ -8,7 +8,7 @@ import pygame
from UI.page import Page
from UI.label import Label
from UI.fonts import fonts
from UI.lang_manager import MyLangManager
# a item for List
# - - - - - - - - - - - --
# | Icon Text..... > |
@@ -34,9 +34,6 @@ class ListItem(object):
self._Icons = {}
self._Fonts = {}
def Init(self,text):
#self._Fonts["normal"] = fonts["veramono12"]
@@ -44,7 +41,7 @@ class ListItem(object):
l = Label()
l._PosX = 16
l.SetCanvasHWND(self._Parent._CanvasHWND)
text = MyLangManager.Tr(text)
l.Init(text,self._Fonts["normal"])
self._Labels["Text"] = l

View File

@@ -26,7 +26,7 @@ class ListPage(Page):
_Icons = {}
_Selector=None
_FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),MyLangManager.Tr("Enter")]
_FootMsg = ["Nav","","","Back","Enter"]
_MyList = []
_ListFontObj = MyLangManager.TrFont("varela15")