App Of Jaq

Merge lp://staging/~deejay1/appofjaq/i18n into lp://staging/~jonobacon/appofjaq/old-trunk

  1. i18n
  2. Merge into old-trunk
Proposed by Łukasz Jernaś
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~deejay1/appofjaq/i18n
Merge into: lp://staging/~jonobacon/appofjaq/old-trunk
Diff against target: 261 lines (+141/-12)
6 files modified
appofjaq.desktop.in (+2/-2)
appofjaq/AboutAppofjaqDialog.py (+2/-1)
appofjaq/PreferencesAppofjaqDialog.py (+1/-0)
bin/appofjaq (+14/-7)
data/ui/PreferencesAppofjaqDialog.ui (+2/-2)
po/appofjaq.pot (+120/-0)
To merge this branch: bzr merge lp://staging/~deejay1/appofjaq/i18n
Reviewer Review Type Date Requested Status
Jono Bacon Pending
Review via email: mp+19911@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Łukasz Jernaś (deejay1) wrote :

This should add i18n support for App of Jaq (at least it does for me). Have fun!

lp://staging/~deejay1/appofjaq/i18n updated
16. By Łukasz Jernaś

Don't mark stock actions as translatable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'appofjaq.desktop.in'
2--- appofjaq.desktop.in 2010-02-21 22:49:14 +0000
3+++ appofjaq.desktop.in 2010-02-22 21:13:13 +0000
4@@ -1,6 +1,6 @@
5 [Desktop Entry]
6-Name=App Of Jaq
7-Comment=Appofjaq application
8+_Name=App Of Jaq
9+_Comment=Appofjaq application
10 Categories=GNOME;Utility;
11 Exec=appofjaq
12 Icon=appofjaq
13
14=== modified file 'appofjaq/AboutAppofjaqDialog.py'
15--- appofjaq/AboutAppofjaqDialog.py 2010-02-17 17:40:52 +0000
16+++ appofjaq/AboutAppofjaqDialog.py 2010-02-22 21:13:13 +0000
17@@ -60,7 +60,8 @@
18 ui_filename = None
19
20 builder = gtk.Builder()
21- builder.add_from_file(ui_filename)
22+ builder.set_translation_domain('appofjaq')
23+ builder.add_from_file(ui_filename)
24 dialog = builder.get_object("about_appofjaq_dialog")
25 dialog.finish_initializing(builder)
26 return dialog
27
28=== modified file 'appofjaq/PreferencesAppofjaqDialog.py'
29--- appofjaq/PreferencesAppofjaqDialog.py 2010-02-17 17:40:52 +0000
30+++ appofjaq/PreferencesAppofjaqDialog.py 2010-02-22 21:13:13 +0000
31@@ -118,6 +118,7 @@
32 ui_filename = None
33
34 builder = gtk.Builder()
35+ builder.set_translation_domain('appofjaq')
36 builder.add_from_file(ui_filename)
37 dialog = builder.get_object("preferences_appofjaq_dialog")
38 dialog.finish_initializing(builder)
39
40=== modified file 'bin/appofjaq'
41--- bin/appofjaq 2010-02-22 03:38:33 +0000
42+++ bin/appofjaq 2010-02-22 21:13:13 +0000
43@@ -30,6 +30,12 @@
44 import glib
45 import re
46
47+# Set up i18n
48+import locale
49+import gettext
50+locale.setlocale(locale.LC_ALL, '')
51+gettext.install('appofjaq', unicode=True)
52+
53 # Check if we are working in the source tree or from the installed
54 # package and mangle the python path accordingly
55 if os.path.dirname(sys.argv[0]) != ".":
56@@ -269,10 +275,10 @@
57
58 if newness == "latest":
59 imageURI = "/home/jono/source/bzr/appofjaq/data/media/logo.png"
60- n = pynotify.Notification("Latest Shot Of Jaq: " + title, "Listen to '" + title + "' in App Of Jaq and join in the conversation!", imageURI)
61+ n = pynotify.Notification(_("Latest Shot Of Jaq: ") + title, _("Listen to '%s' in App Of Jaq and join in the conversation!") % title, imageURI)
62 elif newness == "new":
63 imageURI = "/home/jono/source/bzr/appofjaq/data/media/logo.png"
64- n = pynotify.Notification("New Shot Of Jaq: " + title, "Listen to '" + title + "' in App Of Jaq and join in the conversation!", imageURI)
65+ n = pynotify.Notification(_("New Shot Of Jaq: ") + title, _("Listen to '%s' in App Of Jaq and join in the conversation!") % title, imageURI)
66
67 n.show()
68
69@@ -463,7 +469,7 @@
70
71 # create items for the menu - labels, checkboxes, radio buttons and images are supported:
72
73- check = gtk.CheckMenuItem("Show Main Window")
74+ check = gtk.CheckMenuItem(_("Show Main Window"))
75 check.set_active(True)
76 # check.connect('activate', self.minimize)
77
78@@ -472,15 +478,15 @@
79 sep = gtk.SeparatorMenuItem()
80 self.menu.append(sep)
81
82- homepage = gtk.MenuItem("Shot Of Jaq Website")
83+ homepage = gtk.MenuItem(_("Shot Of Jaq Website"))
84 homepage.connect("activate", self.load_browser_page, "http://www.shotofjaq.org")
85 self.menu.append(homepage)
86
87- fb = gtk.MenuItem("Shot Of Jaq Facebook Page")
88+ fb = gtk.MenuItem(_("Shot Of Jaq Facebook Page"))
89 fb.connect("activate", self.load_browser_page, "http://www.facebook.com/pages/Shot-Of-Jaq/255694367792?ref=ts")
90 self.menu.append(fb)
91
92- cp = gtk.MenuItem("Shot Of Jaq Store")
93+ cp = gtk.MenuItem(_("Shot Of Jaq Store"))
94 cp.connect("activate", self.load_browser_page, "http://www.cafepress.com/shotofjaq")
95 self.menu.append(cp)
96
97@@ -535,6 +541,7 @@
98 ui_filename = None
99
100 builder = gtk.Builder()
101+ builder.set_translation_domain('appofjaq')
102 builder.add_from_file(ui_filename)
103 window = builder.get_object("appofjaq_window")
104 window.finish_initializing(builder)
105@@ -544,7 +551,7 @@
106 #support for command line options
107 import logging, optparse
108 parser = optparse.OptionParser(version="%prog %ver")
109- parser.add_option("-v", "--verbose", action="store_true", dest="verbose", help="Show debug messages")
110+ parser.add_option("-v", "--verbose", action="store_true", dest="verbose", help=_("Show debug messages"))
111 (options, args) = parser.parse_args()
112
113 #set the logging level to show debug messages
114
115=== modified file 'data/ui/PreferencesAppofjaqDialog.ui'
116--- data/ui/PreferencesAppofjaqDialog.ui 2010-01-31 00:56:36 +0000
117+++ data/ui/PreferencesAppofjaqDialog.ui 2010-02-22 21:13:13 +0000
118@@ -22,7 +22,7 @@
119 <property name="layout_style">end</property>
120 <child>
121 <object class="GtkButton" id="button2">
122- <property name="label" translatable="yes">gtk-cancel</property>
123+ <property name="label">gtk-cancel</property>
124 <property name="visible">True</property>
125 <property name="can_focus">True</property>
126 <property name="receives_default">True</property>
127@@ -37,7 +37,7 @@
128 </child>
129 <child>
130 <object class="GtkButton" id="button1">
131- <property name="label" translatable="yes">gtk-ok</property>
132+ <property name="label">gtk-ok</property>
133 <property name="visible">True</property>
134 <property name="can_focus">True</property>
135 <property name="receives_default">True</property>
136
137=== added directory 'po'
138=== added file 'po/appofjaq.pot'
139--- po/appofjaq.pot 1970-01-01 00:00:00 +0000
140+++ po/appofjaq.pot 2010-02-22 21:13:13 +0000
141@@ -0,0 +1,120 @@
142+# SOME DESCRIPTIVE TITLE.
143+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
144+# This file is distributed under the same license as the PACKAGE package.
145+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
146+#
147+#, fuzzy
148+msgid ""
149+msgstr ""
150+"Project-Id-Version: PACKAGE VERSION\n"
151+"Report-Msgid-Bugs-To: \n"
152+"POT-Creation-Date: 2010-02-22 22:09+0100\n"
153+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
154+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
155+"Language-Team: LANGUAGE <LL@li.org>\n"
156+"MIME-Version: 1.0\n"
157+"Content-Type: text/plain; charset=CHARSET\n"
158+"Content-Transfer-Encoding: 8bit\n"
159+
160+#: ../data/ui/AboutAppofjaqDialog.ui.h:1
161+msgid "(c) Jono Bacon"
162+msgstr ""
163+
164+#: ../data/ui/AboutAppofjaqDialog.ui.h:2
165+msgid ""
166+"A desktop client for the awesome greatness that is the Shot Of Jaq podcast."
167+msgstr ""
168+
169+#: ../bin/appofjaq.py:278
170+msgid "Latest Shot Of Jaq: "
171+msgstr ""
172+
173+#: ../bin/appofjaq.py:278 ../bin/appofjaq.py:281
174+#, python-format
175+msgid "Listen to '%s' in App Of Jaq and join in the conversation!"
176+msgstr ""
177+
178+#: ../bin/appofjaq.py:281
179+msgid "New Shot Of Jaq: "
180+msgstr ""
181+
182+#. create items for the menu - labels, checkboxes, radio buttons and images are supported:
183+#: ../bin/appofjaq.py:472
184+msgid "Show Main Window"
185+msgstr ""
186+
187+#: ../bin/appofjaq.py:481
188+msgid "Shot Of Jaq Website"
189+msgstr ""
190+
191+#: ../bin/appofjaq.py:485
192+msgid "Shot Of Jaq Facebook Page"
193+msgstr ""
194+
195+#: ../bin/appofjaq.py:489
196+msgid "Shot Of Jaq Store"
197+msgstr ""
198+
199+#: ../bin/appofjaq.py:554
200+msgid "Show debug messages"
201+msgstr ""
202+
203+#: ../appofjaq.desktop.in.h:1
204+msgid "App Of Jaq"
205+msgstr ""
206+
207+#: ../appofjaq.desktop.in.h:2
208+msgid "Appofjaq application"
209+msgstr ""
210+
211+#: ../data/ui/AppofjaqWindow.ui.h:1
212+msgid "<b>Latest Content</b>"
213+msgstr ""
214+
215+#: ../data/ui/AppofjaqWindow.ui.h:2
216+msgid "<b>Latest Conversation Points</b>"
217+msgstr ""
218+
219+#: ../data/ui/AppofjaqWindow.ui.h:3
220+msgid "News"
221+msgstr ""
222+
223+#: ../data/ui/AppofjaqWindow.ui.h:4
224+msgid "No shot loaded..."
225+msgstr ""
226+
227+#: ../data/ui/AppofjaqWindow.ui.h:5
228+msgid "Reviews"
229+msgstr ""
230+
231+#: ../data/ui/AppofjaqWindow.ui.h:6
232+msgid "Shot Of Jaq"
233+msgstr ""
234+
235+#: ../data/ui/AppofjaqWindow.ui.h:7
236+msgid "Shots"
237+msgstr ""
238+
239+#: ../data/ui/AppofjaqWindow.ui.h:8
240+msgid "Status Area"
241+msgstr ""
242+
243+#: ../data/ui/AppofjaqWindow.ui.h:9
244+msgid "Tweet This!"
245+msgstr ""
246+
247+#: ../data/ui/AppofjaqWindow.ui.h:10
248+msgid "_Edit"
249+msgstr ""
250+
251+#: ../data/ui/AppofjaqWindow.ui.h:11
252+msgid "_File"
253+msgstr ""
254+
255+#: ../data/ui/AppofjaqWindow.ui.h:12
256+msgid "_Help"
257+msgstr ""
258+
259+#: ../data/ui/AppofjaqWindow.ui.h:13
260+msgid "_View"
261+msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: