aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore2
-rw-r--r--Makefile.am29
-rw-r--r--data/com.canonical.indicator.session.gschema.xml.in6
-rw-r--r--src/dialog.c2
4 files changed, 34 insertions, 5 deletions
diff --git a/.bzrignore b/.bzrignore
index 1883f5c..f5b88f9 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -211,3 +211,5 @@ indicator-session-restart.desktop.in
indicator-session-restart.desktop
data/indicator-session-lock-screen.desktop.in
data/indicator-session-lock-screen.desktop
+test-ascii-quotes
+test-space-ellipsis
diff --git a/Makefile.am b/Makefile.am
index 5850769..d63dac8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,13 @@ dist-hook:
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 @@ test-ellipsis: po
@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)
diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
index 0cb6815..d1d7d4c 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -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>
diff --git a/src/dialog.c b/src/dialog.c
index 45cfdcb..4b139ca 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -62,7 +62,7 @@ static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
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",