Merge lp:~cjcurran/indicator-sound/localise-vala-files into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

fixes bug attached

[David Barth (dbarth)]

Builds here. I trust you for the t10n calls themselves

review: Approve

[Sebastien Bacher (seb128)]

you need to list playlists-menu-item in POTFILES.in as well to get it translated

review: Needs Fixing

[Sebastien Bacher (seb128)]

ignore that, I can't read today it seems ;-)

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2011-01-27 03:09:45 +0000
+++ Makefile.am	2011-03-17 16:17:30 +0000
@@ -4,7 +4,10 @@
 	data \
 	po
 
-EXTRA_DIST = autogen.sh vapi/common-defs.vapi
+EXTRA_DIST = \
+  autogen.sh \
+  vapi/common-defs.vapi \
+  vapi/config.vapi
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-02-22 00:32:51 +0000
+++ po/POTFILES.in	2011-03-17 16:17:30 +0000
@@ -2,3 +2,4 @@
 src/indicator-sound.c
 src/mute-menu-item.c
 src/sound-service-dbus.c
+src/playlists-menu-item.c

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-03-14 19:47:59 +0000
+++ src/Makefile.am	2011-03-17 16:17:30 +0000
@@ -56,8 +56,7 @@
 	settings-manager.vala \
 	playlists-menu-item.vala \
 	freedesktop-interfaces.vala \
-	fetch-file.vala
-
+	fetch-file.vala  
 
 music_bridge_VALAFLAGS = \
   --ccode \
@@ -69,10 +68,11 @@
   --pkg gee-1.0 \
   --pkg Dbusmenu-0.4 \
   --pkg common-defs \
-	--pkg gio-2.0 \
-	--pkg gio-unix-2.0 \
-	--pkg gdk-pixbuf-2.0 \
-	--pkg libxml-2.0
+  --pkg config \
+  --pkg gio-2.0 \
+  --pkg gio-unix-2.0 \
+  --pkg gdk-pixbuf-2.0 \
+  --pkg libxml-2.0
 
  $(MAINTAINER_VALAFLAGS)
 
@@ -137,10 +137,10 @@
 #######################
 BUILT_SOURCES = \
 	music_bridge_vala.stamp \
-  $(music_bridge_APIFILES) \
+	$(music_bridge_APIFILES) \
 	gen-sound-service.xml.h \
 	gen-sound-service.xml.c \
-  $(music_bridge_VALASOURCES:.vala=.c)
+	$(music_bridge_VALASOURCES:.vala=.c)
   
 CLEANFILES = \
 	$(BUILT_SOURCES)

=== modified file 'src/common-defs.h'
--- src/common-defs.h	2011-03-15 12:22:21 +0000
+++ src/common-defs.h	2011-03-17 16:17:30 +0000
@@ -19,6 +19,9 @@
 #ifndef __COMMON_DEFS_H__
 #define __COMMON_DEFS_H__
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 typedef enum {
   MUTED,

=== modified file 'src/playlists-menu-item.vala'
--- src/playlists-menu-item.vala	2011-03-11 16:33:04 +0000
+++ src/playlists-menu-item.vala	2011-03-17 16:17:30 +0000
@@ -17,11 +17,13 @@
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+using Config;
 using Dbusmenu;
 using DbusmenuPlaylists;
 using DbusmenuPlaylist;
 using Gee;
 
+
 public class PlaylistsMenuitem : PlayerItem
 {
   private HashMap<int, Dbusmenu.Menuitem> current_playlists;    
@@ -31,12 +33,14 @@
   {
     Object ( item_type: MENUITEM_TYPE, owner: parent );
   }
+
   construct{
     this.current_playlists = new HashMap<int, Dbusmenu.Menuitem>();
     this.root_item = new Menuitem();
 
-    this.root_item.property_set ( MENUITEM_PROP_LABEL, "Choose Playlist" );
+    this.root_item.property_set ( MENUITEM_PROP_LABEL, _("Choose Playlist") );
     this.root_item.property_set ( MENUITEM_PATH, "" );
+
   }
 
   public new void update (PlaylistDetails[] playlists)
@@ -74,7 +78,7 @@
       }
       if (within == false){
         if (this.root_item.property_get (MENUITEM_PATH) == item.property_get (MENUITEM_PATH)){
-          this.root_item.property_set (MENUITEM_PROP_LABEL, "Choose Playlist");        
+          this.root_item.property_set (MENUITEM_PROP_LABEL, _("Choose Playlist"));        
         }
         this.root_item.child_delete (item);   
       }
@@ -118,7 +122,7 @@
   public void active_playlist_update (PlaylistDetails detail)
   {
     var update = detail.name; 
-    if ( update == "" ) update = "Choose Playlist";
+    if ( update == "" ) update = _("Choose Playlist");
     this.root_item.property_set (MENUITEM_PROP_LABEL, update);  
     this.root_item.property_set (MENUITEM_PATH, detail.path);  
   }

=== modified file 'src/sound-service.c'
--- src/sound-service.c	2011-03-16 12:38:04 +0000
+++ src/sound-service.c	2011-03-17 16:17:30 +0000
@@ -51,11 +51,11 @@
 int
 main (int argc, char ** argv)
 {
+  
   g_type_init();
-
+  textdomain (GETTEXT_PACKAGE);
+  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   setlocale (LC_ALL, "");
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-  textdomain (GETTEXT_PACKAGE);
 
   IndicatorService *service = indicator_service_new_version(INDICATOR_SOUND_DBUS_NAME,
                               INDICATOR_SOUND_DBUS_VERSION);

=== added file 'vapi/config.vapi'
--- vapi/config.vapi	1970-01-01 00:00:00 +0000
+++ vapi/config.vapi	2011-03-17 16:17:30 +0000
@@ -0,0 +1,8 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "../config.h")]
+namespace Config {
+  public const string GETTEXT_PACKAGE;
+  public const string LOCALEDIR;
+  public const string PKGDATADIR;
+  public const string PACKAGE_NAME;
+  public const string PACKAGE_VERSION;
+}