From f4e09aff23b8436d5f9ce86a4c6662a0f66f4671 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 16:09:45 -0500 Subject: Add a test to test the space before an ellipsis at the end of a string --- Makefile.am | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5850769..c9e4a44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,8 +35,12 @@ dist-hook: fi TESTS = \ - test-ellipsis + test-ellipsis \ + test-space-ellipsis +##### +# 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 +48,14 @@ 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 \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@ + @echo "exit 0" >> $@ + @chmod +x $@ + CLEANFILES = $(TESTS) -- cgit v1.2.3 From 78a38ad242c381e7bf37e1a91897dbc61f5e5b65 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 16:13:25 -0500 Subject: Fix the message --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c9e4a44..7211fab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,7 @@ test-ellipsis: po 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 \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@ + @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 $@ -- cgit v1.2.3 From abc80c0b8b86e4bae570c834ff99c30356399897 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 16:30:22 -0500 Subject: Adding a test to look for various ASCII quotes --- Makefile.am | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7211fab..d63dac8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,8 @@ dist-hook: TESTS = \ test-ellipsis \ - test-space-ellipsis + test-space-ellipsis \ + test-ascii-quotes ##### # Tests for there being proper ellipsis instead of three periods in a row @@ -58,4 +59,16 @@ test-space-ellipsis: po @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) -- cgit v1.2.3 From 11ee8ffc85036820c4f8f8dbaf79f1dbfff82e94 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 16:30:32 -0500 Subject: Fixing those ASCII quotes --- data/com.canonical.indicator.session.gschema.xml.in | 6 +++--- src/dialog.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 @@ false <_summary>Remove the Log Out item from the session menu - <_description>Makes it so that the logout button doesn't show in the session menu. + <_description>Makes it so that the logout button doesn’t show in the session menu. false <_summary>Remove the Restart item from the session menu - <_description>Makes it so that the restart button doesn't show in the session menu. + <_description>Makes it so that the restart button doesn’t show in the session menu. false <_summary>Remove the shutdown item from the session menu - <_description>Makes it so that the shutdown button doesn't show in the session menu. + <_description>Makes it so that the shutdown button doesn’t show in the session menu. 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", -- cgit v1.2.3 From a73f98649bb15fb23d88adf1f178bcad63198057 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 16:30:52 -0500 Subject: Ignoring the test scripts --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index 3a062ec..dad5a25 100644 --- a/.bzrignore +++ b/.bzrignore @@ -203,3 +203,5 @@ src/libsession_la-user-widget.lo consolekit-seat-client.h data/com.canonical.indicator.session.gschema.valid data/com.canonical.indicator.session.gschema.xml +test-ascii-quotes +test-space-ellipsis -- cgit v1.2.3