Merge lp:~phillip-sz/switchboard-plug-about/more-translatable into lp:~elementary-apps/switchboard-plug-about/trunk

[Phillip Sz]

Improves translation-related code on the plug.

In german we use »« instead of "". This makes it possible.

[lp:~phillip-sz/switchboard-plug-about/more-translatable]

178. By Phillip Sz on 2014-06-22

update to Freya

[Akshay Shekher (voldyman)]

The idea is good but if by mistake a "%s" is removed, the app might crash.

[Tom Beckmann (tombeckmann)]

It'd make sense to add an explicit comment to the translations then and if necessary have it marked for "needs review" in launchpad. I do think this would be the best way to go though.

[Phillip Sz (phillip-sz)]

Yes, I tried to add a comment, not successful so far though.

[Tom Beckmann (tombeckmann)]

You have to add -c to the parameters of xgettext, like so: http://pastebin.com/qsmqhmfD
I haven't added comments for all the relevant strings yet.

[lp:~phillip-sz/switchboard-plug-about/more-translatable]

179. By Phillip Sz on 2014-06-23

added comments for translators

[Phillip Sz (phillip-sz)]

Thanks Tom!

[David Gomes (davidgomes)]

Code style fixes necessary.

review: Needs Fixing

[lp:~phillip-sz/switchboard-plug-about/more-translatable]

180. By Phillip Sz on 2014-06-27

fixed Code style

[Cody Garver (codygarver)]

Revert the translation template bump, that should be done after merge so that this commit diff looks cleaner

bzr revert -r 176 po/about-plug.pot

[lp:~phillip-sz/switchboard-plug-about/more-translatable]

181. By Phillip Sz on 2014-06-27

Reverted the translation template

[David Gomes (davidgomes)]

review: Approve

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2012-09-22 19:00:59 +0000
+++ cmake/Translations.cmake	2014-06-27 19:39:45 +0000
@@ -35,7 +35,7 @@
     endforeach()
 
     add_custom_command (TARGET pot COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${XGETTEXT_EXECUTABLE} -c -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
         ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
         )
-endmacro()
+endmacro()
 \ No newline at end of file
 
=== modified file 'src/Plug.vala'
--- src/Plug.vala	2014-05-29 14:50:03 +0000
+++ src/Plug.vala	2014-06-27 19:39:45 +0000
@@ -113,10 +113,10 @@
                 }
             }
         } catch (Error e) {
-            warning("Couldn't read lsb-release file, assuming elementary OS 0.2");
+            warning("Couldn't read lsb-release file, assuming elementary OS 0.3");
             os = "elementary OS";
-            version = "0.2";
-            codename = "Luna";
+            version = "0.3";
+            codename = "Freya";
         }
         
         file = File.new_for_path("/etc/upstream-release/lsb-release");
@@ -272,12 +272,18 @@
         Granite.Widgets.Utils.apply_text_style_to_label (Granite.TextStyle.TITLE, title);
         title.set_alignment (0, 0);
 
-        var version = new Gtk.Label (_("Version") + ": " + version + " \"" + codename + "\" ( " + arch + " )");
+        // make sure to keep all three %s in the string, otherwise switchboard will crash!
+        // the first %s will be replaced by the version, the second by the codename (e.g "Freya") and the third by the CPU architecture (e.g. "64-bit")        
+        // keep both \" if you want to use " as quote        
+        var version = new Gtk.Label (_("Version: %s \"%s\" ( %s )").printf (version, codename, arch));
         version.set_alignment (0, 0);
         version.set_selectable (true);
         
         if (is_ubuntu != null) {
-            based_off = new Gtk.Label (_("Built on") + ": " + is_ubuntu + " " + ubuntu_version + " ( \"" + ubuntu_codename + "\" )");
+            // make sure to keep all three %s in the string, otherwise switchboard will crash!
+            // the first %s will be replaced by the OS (e.g. "Ubuntu"), the second by the version and the third by the codename (e.g. "Trusty")
+            // keep both \" if you want to use " as quote          
+            based_off = new Gtk.Label (_("Built on: %s %s ( \"%s\" )").printf (is_ubuntu, ubuntu_version, ubuntu_codename));
             based_off.set_alignment (0, 0);
             based_off.set_selectable (true);
         }
@@ -301,16 +307,19 @@
         hardware_title.set_markup (("<b><span size=\"x-large\">%s</span></b>").printf(_("Hardware:")));
         hardware_title.set_alignment (0, 0);
 
-        // Hardware labels
+        // Hardware label
         var processor_label = new Gtk.Label (_("Processor:"));
         processor_label.set_alignment (1, 0);
 
+        // Hardware label
         var memory_label = new Gtk.Label (_("Memory:"));
         memory_label.set_alignment (1, 0);
 
+        // Hardware label
         var graphics_label = new Gtk.Label (_("Graphics:"));
         graphics_label.set_alignment (1, 0);
 
+        // Hardware label
         var hdd_label = new Gtk.Label (_("Storage:"));
         hdd_label.set_alignment (1, 0);
 
@@ -452,4 +461,4 @@
     debug ("Activating About plug");
     var plug = new About.Plug ();
     return plug;
-}
+}
 \ No newline at end of file