ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-session/ellipsis-test into lp:indicator-session.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ted/indicator-session/ellipsis-test/+merge/72281

Fix the last set of ellipsis and make a test to stop them from creeping back in.
-- 
https://code.launchpad.net/~ted/indicator-session/ellipsis-test/+merge/72281
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file '.bzrignore'
--- .bzrignore	2011-08-10 17:11:27 +0000
+++ .bzrignore	2011-08-20 03:51:25 +0000
@@ -38,6 +38,7 @@
 gtk-logout-helper
 .deps
 .libs
+test-ellipsis
 src/libsession.la
 src/libsession_la-indicator-session.lo
 src/status-provider-pidgin-marshal.c

=== modified file 'Makefile.am'
--- Makefile.am	2010-09-21 21:14:43 +0000
+++ Makefile.am	2011-08-20 03:51:25 +0000
@@ -33,3 +33,15 @@
         else \
 			echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
+
+TESTS = \
+	test-ellipsis
+
+test-ellipsis: po
+	@echo "#!/bin/bash" > $@
+	@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+	@echo "grep -c -e \"^msgid.*\.\.\.\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "exit 0" >> $@
+	@chmod +x $@
+
+CLEANFILES = $(TESTS)

=== modified file 'src/device-menu-mgr.c'
=== modified file 'src/dialog.c'
--- src/dialog.c	2011-08-10 18:10:55 +0000
+++ src/dialog.c	2011-08-20 03:51:25 +0000
@@ -53,15 +53,15 @@
    they are also going to get a password dialog to do the action. */
 static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button auth", "Log Out"),
-	/* LOGOUT_DIALOG_RESTART, */	NC_("button auth", "Restart..."),
-	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button auth", "Shut Down...")
+	/* LOGOUT_DIALOG_RESTART, */	NC_("button auth", "Restart…"),
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button auth", "Shut Down…")
 };
 
 /* TRANSLATORS: This button appears on the logout dialog when
    there are updates that require restart.  It will do a restart
    in place of a log out. */
 static const gchar * restart_updates = N_("Restart Instead");
-static const gchar * restart_auth = N_("Restart Instead...");
+static const gchar * restart_auth = N_("Restart Instead…");
 static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts.");
 
 static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = {

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2011-08-12 12:23:35 +0000
+++ src/indicator-session.c	2011-08-20 03:51:25 +0000
@@ -527,7 +527,7 @@
 
   if (variant == NULL || g_variant_get_string(variant, NULL) == NULL ||
       g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) {
-    finalstring = _("Switch User...");
+    finalstring = _("Switch User…");
     set_ellipsize = FALSE;
   }
 
@@ -554,7 +554,7 @@
     gdouble ems = width / pixels_per_em;
     g_debug("Username width %fem", ems);
 
-    finalstring = g_strdup_printf(_("Switch From %s..."), username);
+    finalstring = g_strdup_printf(_("Switch From %s…"), username);
     if (ems >= 20.0f) {
       set_ellipsize = TRUE;
     } else {

=== modified file 'src/user-menu-mgr.c'