Merge lp:~leonardolemos/audience/fix-1653541 into lp:~audience-members/audience/trunk

Proposed by Leonardo Lemos
Status: Merged
Approved by: Cody Garver
Approved revision: 713
Merged at revision: 713
Proposed branch: lp:~leonardolemos/audience/fix-1653541
Merge into: lp:~audience-members/audience/trunk
Diff against target: 56 lines (+10/-10)
1 file modified
src/Window.vala (+10/-10)
To merge this branch: bzr merge lp:~leonardolemos/audience/fix-1653541
Reviewer Review Type Date Requested Status
Audience Members Pending
Review via email: mp+314294@code.launchpad.net

Commit message

Use translated strings for the navigation label (lp:1653541)

Description of the change

Use translated strings for the navigation label.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Window.vala'
2--- src/Window.vala 2016-09-27 19:58:34 +0000
3+++ src/Window.vala 2017-01-08 21:47:15 +0000
4@@ -102,7 +102,7 @@
5 }
6 });
7 library_page.show_episodes.connect ((item) => {
8- navigation_button.label = navigation_button_library;
9+ navigation_button.label = _(navigation_button_library);
10 episodes_page.set_episodes_items (item.episodes);
11 episodes_page.poster.pixbuf = item.poster.pixbuf;
12 main_stack.set_visible_child (episodes_page);
13@@ -382,7 +382,7 @@
14 }
15
16 public void show_library () {
17- navigation_button.label = navigation_button_welcomescreen;
18+ navigation_button.label = _(navigation_button_welcomescreen);
19 navigation_button.show ();
20 main_stack.visible_child = library_page;
21 library_page.scrolled_window.grab_focus ();
22@@ -456,14 +456,14 @@
23 public void play_file (string uri, bool from_beginning = true) {
24 search_entry.visible = false;
25 if (navigation_button.visible) {
26- if (navigation_button.label == navigation_button_library) {
27- navigation_button.label = navigation_button_episodes;
28+ if (navigation_button.label == _(navigation_button_library)) {
29+ navigation_button.label = _(navigation_button_episodes);
30 } else {
31- navigation_button.label = navigation_button_library;
32+ navigation_button.label = _(navigation_button_library);
33 }
34 } else {
35 navigation_button.show ();
36- navigation_button.label = navigation_button_welcomescreen;
37+ navigation_button.label = _(navigation_button_welcomescreen);
38 }
39
40 main_stack.set_visible_child_full ("player", Gtk.StackTransitionType.SLIDE_LEFT);
41@@ -491,11 +491,11 @@
42 title = App.get_instance ().program_name;
43 get_window ().set_cursor (null);
44
45- if (navigation_button.label == navigation_button_library) {
46- navigation_button.label = navigation_button_welcomescreen;
47+ if (navigation_button.label == _(navigation_button_library)) {
48+ navigation_button.label = _(navigation_button_welcomescreen);
49 main_stack.set_visible_child_full ("library", Gtk.StackTransitionType.SLIDE_RIGHT);
50- } else if (navigation_button.label == navigation_button_episodes) {
51- navigation_button.label = navigation_button_library;
52+ } else if (navigation_button.label == _(navigation_button_episodes)) {
53+ navigation_button.label = _(navigation_button_library);
54 main_stack.set_visible_child_full ("episodes", Gtk.StackTransitionType.SLIDE_RIGHT);
55 } else {
56 navigation_button.hide ();

Subscribers

People subscribed via source and target branches