Skip to content

Commit

Permalink
Translations updated. Typos fixed, pot file reorganized and missing l…
Browse files Browse the repository at this point in the history
…ines added, redundant lines removed. Fixes #4.
imiolek-ireneusz committed Jan 7, 2019
1 parent f37869f commit ea3ccf8
Showing 28 changed files with 631 additions and 962 deletions.
10 changes: 0 additions & 10 deletions classes/info_bar.py
Original file line number Diff line number Diff line change
@@ -466,16 +466,6 @@ def title_only(self):
self.layout_update()
self.title_space = self.width - 10

def sure_to_close(self):
self.hide_buttons(0, 0, 0, 0, 1, 0, 1, 0, 0)
self.mainloop.redraw_needed[1] = True
self.hidden = True
self.close_dialog = True
self.title = ex.unival(self.lang.d["close_confirm"])
self.subtitle = ""
self.mainloop.sfx.play(2)
self.layout_update()

def show_info_dialog(self):
self.mainloop.game_board.show_info_dialog()
self.resetbtns()
3 changes: 1 addition & 2 deletions classes/loginscreen.py
Original file line number Diff line number Diff line change
@@ -1811,8 +1811,7 @@ def add_prefs_elements(self):
self.edit_list.add(self.cb0)


self.cb2 = PCheckbox(self, self.w - 135, 30, self.left + 20, self.top + 150, False,
self.lang.b["check for updates"])
self.cb2 = PCheckbox(self, self.w - 135, 30, self.left + 20, self.top + 150, False, "")
"""
if self.mainloop.android is not None:
2 changes: 1 addition & 1 deletion classes/menu.py
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ def add_top_category(self, top_id, title, subtitle, img_src1, menu_line): # 105
self.elements.append(new_top_category)

def add_all(self):
self.add_category(0, 0, self.lang.d["Info Category"], "", "ico_c_00.png", False, None)
self.add_category(0, 0, "", "", "ico_c_00.png", False, None)

self.badge_count = self.mainloop.db.get_completion_count(self.mainloop.userid)
# [0 1 2 3 4 5 6 7]
3 changes: 1 addition & 2 deletions game_boards/game030.py
Original file line number Diff line number Diff line change
@@ -137,9 +137,8 @@ def hit(self):
self.score.update_me = True

def game_over(self):
tts = self.dp["work harder"]
self.level.game_step = self.total_
self.level.game_over(tts)
self.level.game_over()

def check_result(self):
if self.total_ < self.data[2]:
13 changes: 1 addition & 12 deletions game_boards/game054.py
Original file line number Diff line number Diff line change
@@ -220,40 +220,30 @@ def check_result(self):
b = self.rgbx3[2][2]

if self.picked != [r, g, b]:
help = ""
if self.picked[0] > r:
self.guides[0].value = "⇑"
help += self.dp['more red'] + ", "
elif self.picked[0] < r:
self.guides[0].value = "⇓"
help += self.dp['less red'] + ", "
else:
self.guides[0].value = " "
help += self.dp['red is ok'] + ", "
self.guides[0].set_display_check(True)

if self.picked[1] > g:
self.guides[1].value = "⇑"
help += self.dp['more green'] + ", "
elif self.picked[1] < g:
self.guides[1].value = "⇓"
help += self.dp['less green'] + ", "
else:
self.guides[1].value = " "
help += self.dp['green is ok'] + ", "
self.guides[1].set_display_check(True)

if self.picked[2] > b:
self.guides[2].value = "⇑"
help += self.dp['more blue'] + ". "
elif self.picked[2] < b:
self.guides[2].value = "⇓"
help += self.dp['less blue'] + ". "
else:
self.guides[2].value = " "
help += self.dp['blue is ok'] + ". "
self.guides[2].set_display_check(True)
#self.say(help)

self.level.try_again(silent=self.mainloop.speaker.talkative)

for each in self.guides:
@@ -265,4 +255,3 @@ def check_result(self):
each.value = ""
self.level.next_board()
self.mainloop.redraw_needed[0] = True

13 changes: 0 additions & 13 deletions game_boards/game055.py
Original file line number Diff line number Diff line change
@@ -219,40 +219,29 @@ def auto_check_reset(self):

def check_result(self):
if self.picked_steps != self.rgb_g:
help = ""
if self.picked_steps[0] < self.rgb_g[0]:
self.guides[0].value = "⇑"
help += self.dp['more cyan'] + ", "
elif self.picked_steps[0] > self.rgb_g[0]:
self.guides[0].value = "⇓"
help += self.dp['less cyan'] + ", "
else:
self.guides[0].value = " "
help += self.dp['cyan is ok'] + ", "
self.guides[0].set_display_check(True)

if self.picked_steps[1] < self.rgb_g[1]:
self.guides[1].value = "⇑"
help += self.dp['more magenta'] + ", "
elif self.picked_steps[1] > self.rgb_g[1]:
self.guides[1].value = "⇓"
help += self.dp['less magenta'] + ", "
else:
self.guides[1].value = " "
help += self.dp['magenta is ok'] + ", "
self.guides[1].set_display_check(True)

if self.picked_steps[2] < self.rgb_g[2]:
self.guides[2].value = "⇑"
help += self.dp['more yellow'] + ". "
elif self.picked_steps[2] > self.rgb_g[2]:
self.guides[2].value = "⇓"
help += self.dp['less yellow'] + ". "
else:
self.guides[2].value = " "
help += self.dp['yellow is ok'] + ". "
self.guides[2].set_display_check(True)
#self.say(help)

self.level.try_again(silent=self.mainloop.speaker.talkative)

@@ -264,5 +253,3 @@ def check_result(self):
each.value = ""
self.level.next_board()
self.mainloop.redraw_needed[0] = True


Loading

0 comments on commit ea3ccf8

Please sign in to comment.