Merge lp:~francesco-marella/a4/i18n into lp:a4

[Francesco Marella]

[Andrea Gasparini (gaspa)]

The old functionalities are ok, and strings are correct. Unfortunately I don't know enough the translation engine to make further tests, but to me the code is ok.

Just one remark (and a note for the merger), we usually try to keep the code clean with some tools.
A brief test with pep8 gives:
a4lib/i18n.py:12:1: E302 expected 2 blank lines, found 1
(It's just one blank line, I guess the one of us that will merge can correct this as well)

review: Approve

[lp:~francesco-marella/a4/i18n]

109. By Francesco Marella on 2011-02-20

Add support for i18n

[Francesco Marella (francesco-marella)]

>
> The old functionalities are ok, and strings are correct. Unfortunately I don't
> know enough the translation engine to make further tests, but to me the code
> is ok.
>
> Just one remark (and a note for the merger), we usually try to keep the code
> clean with some tools.
> A brief test with pep8 gives:
> a4lib/i18n.py:12:1: E302 expected 2 blank lines, found 1
> (It's just one blank line, I guess the one of us that will merge can correct
> this as well)
Fixed, thanks.

[lp:~francesco-marella/a4/i18n]

110. By Francesco Marella on 2011-02-24

i18n: when running from source, fetch the mo files from the build dir

=== modified file 'a4lib/app.py'
--- a4lib/app.py	2010-12-30 20:30:01 +0000
+++ a4lib/app.py	2011-02-24 16:56:48 +0000
@@ -13,6 +13,7 @@
 from a4lib.presentation import PresentationError, NoMetadataError
 from a4lib.player import GtkCairoPlayer
 from a4lib.editor import Editor
+import a4lib.i18n
 
 UI_PATHS = ('data', '/usr/local/share/a4/data', '/usr/share/a4/data')
 
@@ -22,6 +23,7 @@
 
     def __init__(self):
         self.builder = gtk.Builder()
+        self.builder.set_translation_domain("a4")
         for path in UI_PATHS:
             file_name = os.path.join(path, 'window_main.glade')
             try:
@@ -81,7 +83,7 @@
             dialog.destroy()
         except NoMetadataError as error:
             msg = 'No A4 data found into file,\nwould you like to convert this file into an A4 presentation?'
-            dialog = gtk.Dialog('Import', self.gtk_window,
+            dialog = gtk.Dialog(_("Import"), self.gtk_window,
                         gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
                         (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
                          gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
@@ -142,7 +144,7 @@
         """Event called when the 'Open' button is clicked."""
         # Set up the file chooser dialog.
         dialog = gtk.FileChooserDialog(
-            None, None, gtk.FILE_CHOOSER_ACTION_OPEN, (
+            _("Open a presentation"), None, gtk.FILE_CHOOSER_ACTION_OPEN, (
                 gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
                 gtk.STOCK_OPEN, gtk.RESPONSE_OK))
         dialog.set_default_response(gtk.RESPONSE_OK)
@@ -166,7 +168,7 @@
 
     def on_save_as_clicked(self, widget):
         dialog = gtk.FileChooserDialog(
-            None, None, gtk.FILE_CHOOSER_ACTION_SAVE, (
+            _("Save presentation as..."), None, gtk.FILE_CHOOSER_ACTION_SAVE, (
                 gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
                 gtk.STOCK_SAVE, gtk.RESPONSE_OK))
         dialog.set_default_response(gtk.RESPONSE_OK)
@@ -342,15 +344,17 @@
         dialog = gtk.AboutDialog()
         dialog.set_name('A4')
         dialog.set_version(__version__)
-        dialog.set_comments('A stylish tool to create and view cute presentations.')
+        dialog.set_comments(_('A stylish tool to create and view cute presentations.'))
         dialog.set_website('http://launchpad.net/a4')
-        dialog.set_website_label('A4 website')
+        dialog.set_website_label(_("A4 website"))
         dialog.set_copyright('Copyright (C) 2010 A4 Developers')
         #dialog.set_logo("LOGO_GOES_HERE")
         #dialog.set_icon_from_file("ICON_GOES_HERE")
         #code to automagically fetch authors and license should be used here
         dialog.set_authors(['A4 Developers'])
-        dialog.set_license('A4 is released under the terms of GNU GPL, version 3.')
+        dialog.set_license(_("A4 is released under the terms of GNU GPL, version 3."))
+        #name surname email of the translator(s)
+        dialog.set_translator_credits(_("translator-credits"))
         dialog.run()
         dialog.destroy()
 
 
=== added file 'a4lib/i18n.py'
--- a4lib/i18n.py	1970-01-01 00:00:00 +0000
+++ a4lib/i18n.py	2011-02-24 16:56:48 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2010 A4 Developers.  This software is licensed under the
+# GNU General Public License version 3 (see the file COPYING).
+
+import os
+import gettext
+import locale
+
+MESSAGES_DIR = "build/mo"
+if not (os.path.isdir(MESSAGES_DIR) and os.path.exists(MESSAGES_DIR)):
+    MESSAGES_DIR = "/usr/share/locale"
+
+
+def setup_locale_and_gettext():
+    package_name = 'a4'
+    # Install _() builtin for gettext; always returning unicode objects
+    # also install ngettext()
+    gettext.install(package_name, localedir=MESSAGES_DIR, unicode=True,
+                    names=("ngettext",))
+    locale.bindtextdomain(package_name, MESSAGES_DIR)
+    locale.bind_textdomain_codeset(package_name, "UTF-8")
+
+    try:
+        locale.setlocale(locale.LC_ALL, "")
+    except locale.Error, e:
+        pass
+
+setup_locale_and_gettext()
 
=== renamed file 'data/a4.desktop' => 'data/a4.desktop.in'
--- data/a4.desktop	2010-08-02 13:02:07 +0000
+++ data/a4.desktop.in	2011-02-24 16:56:48 +0000
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=A4
-Comment=A stylish tool to create and view cool presentations
+_Name=A4
+_Comment=A stylish tool to create and view cool presentations
 Icon=a4
 Exec=a4
 Terminal=false
 Categories=Office;Presentation;
+StartupNotify=true
 
=== modified file 'data/window_main.glade'
--- data/window_main.glade	2011-01-18 17:57:15 +0000
+++ data/window_main.glade	2011-02-24 16:56:48 +0000
@@ -135,7 +135,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_open">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Open presentation</property>
+                <property name="tooltip_text" translatable="yes">Open presentation</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-open</property>
                 <signal name="clicked" handler="on_open_clicked"/>
@@ -148,7 +148,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_save">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Save presentation</property>
+                <property name="tooltip_text" translatable="yes">Save presentation</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-save</property>
                 <signal name="clicked" handler="on_save_clicked"/>
@@ -161,7 +161,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_close">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Close presentation</property>
+                <property name="tooltip_text" translatable="yes">Close presentation</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-close</property>
                 <signal name="clicked" handler="on_close_clicked"/>
@@ -183,7 +183,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_previous">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Previous view</property>
+                <property name="tooltip_text" translatable="yes">Previous view</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-go-back</property>
                 <signal name="clicked" handler="on_previous_clicked"/>
@@ -196,7 +196,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_next">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Next view</property>
+                <property name="tooltip_text" translatable="yes">Next view</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-go-forward</property>
                 <signal name="clicked" handler="on_next_clicked"/>
@@ -218,7 +218,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_zoom_in">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Zoom in</property>
+                <property name="tooltip_text" translatable="yes">Zoom in</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-zoom-in</property>
                 <signal name="clicked" handler="on_zoom_in_clicked"/>
@@ -231,7 +231,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_zoom_out">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Zoom out</property>
+                <property name="tooltip_text" translatable="yes">Zoom out</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-zoom-out</property>
                 <signal name="clicked" handler="on_zoom_out_clicked"/>
@@ -244,7 +244,7 @@
             <child>
               <object class="GtkToolButton" id="toolbutton_fullscreen">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Fullscreen</property>
+                <property name="tooltip_text" translatable="yes">Fullscreen</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-fullscreen</property>
                 <signal name="clicked" handler="on_fullscreen_activate"/>
@@ -285,7 +285,7 @@
             <child>
               <object class="GtkToggleToolButton" id="toolbutton_editor">
                 <property name="visible">True</property>
-                <property name="tooltip_markup">Editor</property>
+                <property name="tooltip_text" translatable="yes">Editor</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-edit</property>
                 <signal name="clicked" handler="on_editor_clicked"/>
 
=== added directory 'po'
=== added file 'po/LINGUAS'
--- po/LINGUAS	1970-01-01 00:00:00 +0000
+++ po/LINGUAS	2011-02-24 16:56:48 +0000
@@ -0,0 +1,1 @@
+# Set of available languages. Keep it alphabatical. One lingua per line.
 
=== added file 'po/POTFILES.in'
--- po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in	2011-02-24 16:56:48 +0000
@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+# order: data files, modules, others
+
+data/a4.desktop.in
+
+[type: gettext/glade] data/window_main.glade
+
+a4lib/app.py
+a4lib/editor.py
+a4lib/player.py
+a4lib/presentation_objects.py
+a4lib/presentation.py
+a4lib/region.py
 
=== added file 'po/POTFILES.skip'
--- po/POTFILES.skip	1970-01-01 00:00:00 +0000
+++ po/POTFILES.skip	2011-02-24 16:56:48 +0000
@@ -0,0 +1,3 @@
+# files to skip
+
+a4lib/__init__.py
 
=== added file 'po/a4.pot'
--- po/a4.pot	1970-01-01 00:00:00 +0000
+++ po/a4.pot	2011-02-24 16:56:48 +0000
@@ -0,0 +1,147 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-26 17:23+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/a4.desktop.in.h:1
+msgid "A stylish tool to create and view cool presentations"
+msgstr ""
+
+#: ../data/a4.desktop.in.h:2 ../data/window_main.glade.h:1
+msgid "A4"
+msgstr ""
+
+#: ../data/window_main.glade.h:2
+msgid "Close presentation"
+msgstr ""
+
+#: ../data/window_main.glade.h:3
+msgid "Editor"
+msgstr ""
+
+#: ../data/window_main.glade.h:4
+msgid "Frames"
+msgstr ""
+
+#: ../data/window_main.glade.h:5
+msgid "Fullscreen"
+msgstr ""
+
+#: ../data/window_main.glade.h:6
+msgid "Hidden Frame"
+msgstr ""
+
+#: ../data/window_main.glade.h:7
+msgid "Image"
+msgstr ""
+
+#: ../data/window_main.glade.h:8
+msgid "Next view"
+msgstr ""
+
+#: ../data/window_main.glade.h:9
+msgid "Normal frame"
+msgstr ""
+
+#: ../data/window_main.glade.h:10
+msgid "Notes"
+msgstr ""
+
+#: ../data/window_main.glade.h:11
+msgid "Open presentation"
+msgstr ""
+
+#: ../data/window_main.glade.h:12
+msgid "Path"
+msgstr ""
+
+#: ../data/window_main.glade.h:13
+msgid "Polaroid"
+msgstr ""
+
+#: ../data/window_main.glade.h:14
+msgid "Previous view"
+msgstr ""
+
+#: ../data/window_main.glade.h:15
+msgid "Rect"
+msgstr ""
+
+#: ../data/window_main.glade.h:16
+msgid "Save presentation"
+msgstr ""
+
+#: ../data/window_main.glade.h:17
+msgid "Selector"
+msgstr ""
+
+#: ../data/window_main.glade.h:18
+msgid "Shapes"
+msgstr ""
+
+#: ../data/window_main.glade.h:19
+msgid "Text"
+msgstr ""
+
+#: ../data/window_main.glade.h:20
+msgid "Zoom in"
+msgstr ""
+
+#: ../data/window_main.glade.h:21
+msgid "Zoom out"
+msgstr ""
+
+#: ../data/window_main.glade.h:22
+msgid "_File"
+msgstr ""
+
+#: ../data/window_main.glade.h:23
+msgid "_Help"
+msgstr ""
+
+#: ../data/window_main.glade.h:24
+msgid "_View"
+msgstr ""
+
+#: ../a4lib/app.py:86
+msgid "Import"
+msgstr ""
+
+#: ../a4lib/app.py:147
+msgid "Open a presentation"
+msgstr ""
+
+#: ../a4lib/app.py:171
+msgid "Save presentation as..."
+msgstr ""
+
+#: ../a4lib/app.py:347
+msgid "A stylish tool to create and view cute presentations."
+msgstr ""
+
+#: ../a4lib/app.py:349
+msgid "A4 website"
+msgstr ""
+
+#: ../a4lib/app.py:355
+msgid "A4 is released under the terms of GNU GPL, version 3."
+msgstr ""
+
+#. name surname email of the translator(s)
+#: ../a4lib/app.py:357
+msgid "translator-credits"
+msgstr ""