Merge lp:~dpm/lernid/enable-translations into lp:lernid

[David Planella]

[David Planella (dpm)]

This branch enables loading the translations in gtkBuilder. Additionally, some strings have been marked as translatable in the code and the POT template has been updated.

To test translations with an installed lernid package from the PPA in say, German (i.e. .mo files are already installed in /usr/share/locale):

  LANGUAGE=de_DE.UTF-8 lernid

(if the files are installed in /usr/share/locale, this can also be tested within the source tree, simply using 'LANGUAGE=de_DE.UTF-8 bin/lernid')

In the future, when new translatable strings are added in the code, they will simply have to be surrounded by _() and the POT template updated (e.g. with './setup.py build_i18n') and committed for translators to see them in Launchpad.

[Jono Bacon (jonobacon)]

Thanks for the patch, David. Could you update your trunk and update the branch: this merge proposal applies to quite an old branch revision. Thanks!

review: Needs Fixing

[lp:~dpm/lernid/enable-translations]

20. By David Planella on 2009-12-05

Merged from trunk, enabled translations, updated POT file

[David Planella (dpm)]

Oops, sorry Jono, I had not correctly updated from trunk.

Here's a new merge proposal after having merged the latest trunk changes, the last for the weekend.

review: Needs Resubmitting

=== modified file 'bin/lernid'
--- bin/lernid	2009-12-04 20:01:08 +0000
+++ bin/lernid	2009-12-05 18:48:14 +0000
@@ -29,6 +29,7 @@
 import time
 import datetime
 import glib
+import locale
 
 # Check if we are working in the source tree or from the installed 
 # package and mangle the python path accordingly
@@ -263,8 +264,8 @@
     def connect_to_resources(self):
         """Connect to the currently selected event."""
 
-        self.builder.get_object("statusbar").set_text("Connected to " + self.event)
-        self.send_notification("Connected to " + self.event)
+        self.builder.get_object("statusbar").set_text(_("Connected to ") + self.event)
+        self.send_notification(_("Connected to ") + self.event)
         
         config = ConfigParser.ConfigParser()
         config.read(os.path.join(self.lernidfolder_events, "config.lernid"))
@@ -293,7 +294,7 @@
         logging.debug("Disconnecting from %s" % self.event)
         self.irc.disconnect()
         
-        self.send_notification("Disconnecting from " + self.event)
+        self.send_notification(_("Disconnecting from ") + self.event)
 
         self.schedule.hide()
         self.chat.hide()
@@ -336,6 +337,8 @@
     if not os.path.exists(ui_filename):
         ui_filename = None
 
+    # Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=574520
+    locale.textdomain("lernid")
     builder = gtk.Builder()
     builder.add_from_file(ui_filename)
     window = builder.get_object("lernid_window")
@@ -345,8 +348,9 @@
 if __name__ == "__main__":
     #support for command line options
     import logging, optparse
+    gettext.install('lernid', unicode=True)
     parser = optparse.OptionParser(version="%prog %ver")
-    parser.add_option("-v", "--verbose", action="store_true", dest="verbose", help="Show debug messages")
+    parser.add_option("-v", "--verbose", action="store_true", dest="verbose", help=_("Show debug messages"))
     (options, args) = parser.parse_args()
 
     #set the logging level to show debug messages
@@ -354,8 +358,6 @@
         logging.basicConfig(level=logging.DEBUG)
         logging.debug('logging enabled')
 
-    gettext.install('lernid', unicode=True)
-
     #run the application
     window = NewLernidWindow()
     window.show()

=== modified file 'po/lernid.pot'
--- po/lernid.pot	2009-11-30 10:04:44 +0000
+++ po/lernid.pot	2009-12-05 18:48:14 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 21:33-0800\n"
+"POT-Creation-Date: 2009-12-05 19:38+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,30 +17,34 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/ui/LernidWindow.ui.h:1
-msgid "Chat Room"
+msgid "<b>Chatroom</b>"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:2
-msgid "Classroom"
-msgstr ""
-
-#: ../data/ui/LernidWindow.ui.h:3 ../lernid.desktop.in.h:1
+msgid "<b>Classroom</b>"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:3
+msgid "<b>Resources</b>"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:4
+msgid "<b>Schedule</b>"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:5 ../lernid.desktop.in.h:1
 msgid "Lernid"
 msgstr ""
 
-#: ../data/ui/LernidWindow.ui.h:4
+#: ../data/ui/LernidWindow.ui.h:6
 msgid "Not Connected."
 msgstr ""
 
-#: ../data/ui/LernidWindow.ui.h:5
-msgid "Schedule"
-msgstr ""
-
-#: ../data/ui/LernidWindow.ui.h:6
+#: ../data/ui/LernidWindow.ui.h:7
 msgid "_Event"
 msgstr ""
 
-#: ../data/ui/LernidWindow.ui.h:7
+#: ../data/ui/LernidWindow.ui.h:8
 msgid "_Help"
 msgstr ""
 
@@ -64,6 +68,10 @@
 "with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
+#: ../data/ui/AboutLernidDialog.ui.h:8
+msgid "David Planella <[e-mail]>"
+msgstr ""
+
 #: ../lernid.desktop.in.h:2
 msgid "Lernid application"
 msgstr ""
@@ -87,3 +95,15 @@
 #: ../data/ui/PreferencesLernidDialog.ui.h:2
 msgid "gtk-ok"
 msgstr ""
+
+#: ../bin/lernid.py:267 ../bin/lernid.py:268
+msgid "Connected to "
+msgstr ""
+
+#: ../bin/lernid.py:297
+msgid "Disconnecting from "
+msgstr ""
+
+#: ../bin/lernid.py:353
+msgid "Show debug messages"
+msgstr ""

=== modified file 'setup.py' (properties changed: -x to +x)