ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #03821
[Merge] lp:~ted/indicator-session/string-checks into lp:indicator-session
Ted Gould has proposed merging lp:~ted/indicator-session/string-checks into lp:indicator-session.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
For more details, see:
https://code.launchpad.net/~ted/indicator-session/string-checks/+merge/72629
String tests and fixes as discussed on ayatana-dev
--
https://code.launchpad.net/~ted/indicator-session/string-checks/+merge/72629
Your team ayatana-commits is subscribed to branch lp:indicator-session.
=== modified file '.bzrignore'
--- .bzrignore 2011-08-22 12:32:00 +0000
+++ .bzrignore 2011-08-23 21:50:13 +0000
@@ -203,3 +203,5 @@
consolekit-seat-client.h
data/com.canonical.indicator.session.gschema.valid
data/com.canonical.indicator.session.gschema.xml
+test-ascii-quotes
+test-space-ellipsis
=== modified file 'Makefile.am'
--- Makefile.am 2011-08-20 02:23:14 +0000
+++ Makefile.am 2011-08-23 21:50:13 +0000
@@ -35,8 +35,13 @@
fi
TESTS = \
- test-ellipsis
+ test-ellipsis \
+ test-space-ellipsis \
+ test-ascii-quotes
+#####
+# Tests for there being proper ellipsis instead of three periods in a row
+#####
test-ellipsis: po
@echo "#!/bin/bash" > $@
@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
@@ -44,4 +49,26 @@
@echo "exit 0" >> $@
@chmod +x $@
+#####
+# Tests for there being a space before an ellipsis
+#####
+test-space-ellipsis: po
+ @echo "#!/bin/bash" > $@
+ @echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+ @echo "grep -c -e \"^msgid.* â¦\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Space before ellipsis found in user visible strings\" >&2 && exit 1" >> $@
+ @echo "exit 0" >> $@
+ @chmod +x $@
+
+#####
+# Tests for ASCII quote types
+#####
+test-ascii-quotes: po
+ @echo "#!/bin/bash" > $@
+ @echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+ @echo "grep -c -e \"^msgid \\\".*'.*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII apostrophy found in user visible strings\" >&2 && exit 1" >> $@
+ @echo "grep -c -e \"^msgid \\\".*\\\".*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII quote found in user visible strings\" >&2 && exit 1" >> $@
+ @echo "grep -c -e \"^msgid \\\".*\\\`.*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII backtick found in user visible strings\" >&2 && exit 1" >> $@
+ @echo "exit 0" >> $@
+ @chmod +x $@
+
CLEANFILES = $(TESTS)
=== modified file 'data/com.canonical.indicator.session.gschema.xml.in'
--- data/com.canonical.indicator.session.gschema.xml.in 2011-08-19 19:32:20 +0000
+++ data/com.canonical.indicator.session.gschema.xml.in 2011-08-23 21:50:13 +0000
@@ -8,17 +8,17 @@
<key name="suppress-logout-menuitem" type="b">
<default>false</default>
<_summary>Remove the Log Out item from the session menu</_summary>
- <_description>Makes it so that the logout button doesn't show in the session menu.</_description>
+ <_description>Makes it so that the logout button doesnât show in the session menu.</_description>
</key>
<key name="suppress-restart-menuitem" type="b">
<default>false</default>
<_summary>Remove the Restart item from the session menu</_summary>
- <_description>Makes it so that the restart button doesn't show in the session menu.</_description>
+ <_description>Makes it so that the restart button doesnât show in the session menu.</_description>
</key>
<key name="suppress-shutdown-menuitem" type="b">
<default>false</default>
<_summary>Remove the shutdown item from the session menu</_summary>
- <_description>Makes it so that the shutdown button doesn't show in the session menu.</_description>
+ <_description>Makes it so that the shutdown button doesnât show in the session menu.</_description>
</key>
</schema>
</schemalist>
=== modified file 'src/dialog.c'
--- src/dialog.c 2011-08-20 02:23:57 +0000
+++ src/dialog.c 2011-08-23 21:50:13 +0000
@@ -62,7 +62,7 @@
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 * body_logout_update = N_("Some software updates won't apply until the computer next restarts.");
+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] = {
/* LOGOUT_DIALOG_LOGOUT, */ "system-log-out",
=== modified file 'src/user-menu-mgr.c'
--- src/user-menu-mgr.c 2011-08-23 11:51:51 +0000
+++ src/user-menu-mgr.c 2011-08-23 21:50:13 +0000
@@ -44,6 +44,9 @@
static void activate_user_session (DbusmenuMenuitem *mi,
guint timestamp,
gpointer user_data);
+static void activate_user_accounts (DbusmenuMenuitem *mi,
+ guint timestamp,
+ gpointer user_data);
static gint compare_users_by_username (const gchar *a,
const gchar *b);
static void activate_online_accounts (DbusmenuMenuitem *mi,
Follow ups