Merge lp:~codygarver/audience/fix-1380819 into lp:~audience-members/audience/trunk

[Cody Garver]

Add some and move .desktop translatable strings from desktop-launcher.vala to Audience.vala to prepare for bug #1380819

[lp:~codygarver/audience/fix-1380819]

423. By Cody Garver on 2014-10-23

QUICKLIST_ABOUT is not actually a constant

424. By Cody Garver on 2014-10-23

8 spaces because it's inside class

[Tom Beckmann (tombeckmann)]

Code looks good.

review: Approve (codestyle & code)

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-10-20 16:38:01 +0000
+++ src/Audience.vala	2014-10-23 09:32:31 +0000
@@ -31,8 +31,19 @@
 
     public class App : Granite.Application {
 
+        /**
+         * Translatable launcher (.desktop) strings to be added to template (.pot) file.
+         * These strings should reflect any changes in these launcher keys in .desktop file
+         */
+        public const string VIDEOS = N_("Videos");
+        public const string PROGRAM_NAME = "Audience";
+        public const string KEYWORDS = N_("Audience;Video;Player;Movies;");
+        public const string COMMENT = N_("Watch videos and movies");
+        public const string GENERIC_NAME = N_("Video Player");
+        public string QUICKLIST_ABOUT = N_("About ") + PROGRAM_NAME;
+
         construct {
-            program_name = "Audience";
+            program_name = PROGRAM_NAME;
             exec_name = "audience";
 
             build_data_dir = Constants.DATADIR;

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-13 03:12:48 +0000
+++ src/CMakeLists.txt	2014-10-23 09:32:31 +0000
@@ -62,7 +62,6 @@
     Widgets/Playlist.vala
     Widgets/PlaylistPopover.vala
     Widgets/VideoPlayer.vala
-    desktop-launcher.vala
   PACKAGES
     ${VALA_DEPS}
   OPTIONS
@@ -75,4 +74,4 @@
 
 add_executable (${EXEC_NAME} ${VALA_C})
 target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
-install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
\ No newline at end of file
+install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)

=== removed file 'src/desktop-launcher.vala'
--- src/desktop-launcher.vala	2014-10-14 00:41:22 +0000
+++ src/desktop-launcher.vala	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-namespace DesktopLauncher {
-    /* Translatable launcher (.desktop) strings to be added to   */
-    /* template (.pot) file. These strings MUST reflect any      */
-    /* changes in these launcher keys in .desktop file.          */
-    public const string COMMENT = N_("Watch videos and movies");
-    public const string GENERIC_NAME = N_("Video Player");
-    public const string ABOUT = N_("About Audience");
-}