From 4638f4f0e4ee3860f8f66ed9421e22043eb8b5d2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 20:59:21 -0500 Subject: Making a check to see if there is ellipsis in the user visible strings --- Makefile.am | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile.am b/Makefile.am index 391ff49..45bb764 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,14 @@ dist-hook: else \ echo Failed to generate AUTHORS: not a branch >&2; \ fi + +TESTS = \ + test-ellipsis + +test-ellipsis: po + @echo "#!/bin/bash" > $@ + @echo "(cd po && make indicator-session.pot)" >> $@ + @echo "grep -c -e \"^msgid.*\.\.\.\\\"\" po/indicator-session.pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@ + @chmod +x $@ + +CLEANFILES = $(TESTS) -- cgit v1.2.3 From a4baeab757fdc4fdda71d5c24f863d5c8341f7f3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 21:01:01 -0500 Subject: Making a bit more generic by using GETTEXT_PACKAGE --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 45bb764..7a2a437 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,8 +39,8 @@ TESTS = \ test-ellipsis: po @echo "#!/bin/bash" > $@ - @echo "(cd po && make indicator-session.pot)" >> $@ - @echo "grep -c -e \"^msgid.*\.\.\.\\\"\" po/indicator-session.pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@ + @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" >> $@ @chmod +x $@ CLEANFILES = $(TESTS) -- cgit v1.2.3 From af742655e42477d3333dc85dadfc3d5df300680d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 21:23:14 -0500 Subject: Ensuring a pass is a pass --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 7a2a437..5850769 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ 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) -- cgit v1.2.3 From 229e92aa9c59c822808bf9e129592247347e22b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 21:23:57 -0500 Subject: Fix all the ellipsis --- src/device-menu-mgr.c | 8 ++++---- src/dialog.c | 6 +++--- src/gconf-helper.c | 6 +++--- src/indicator-session.c | 4 ++-- src/user-menu-mgr.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 3223cf5..1dd2d7f 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -523,7 +523,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) system_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (system_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("System Settings...")); + _("System Settings…")); g_signal_connect (G_OBJECT(system_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_system_settings_with_context), ""); @@ -534,7 +534,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) display_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (display_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("Displays...")); + _("Displays…")); g_signal_connect (G_OBJECT(display_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_system_settings_with_context), "display"); @@ -544,7 +544,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) bluetooth_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (bluetooth_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("Bluetooth...")); + _("Bluetooth…")); g_signal_connect (G_OBJECT(bluetooth_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_system_settings_with_context), "bluetooth"); @@ -555,7 +555,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) login_settings_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (login_settings_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _("Startup Applications...")); + _("Startup Applications…")); g_signal_connect (G_OBJECT(login_settings_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_session_properties), diff --git a/src/dialog.c b/src/dialog.c index 299f954..45cfdcb 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -53,15 +53,15 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { 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] = { diff --git a/src/gconf-helper.c b/src/gconf-helper.c index 4911dcb..93ae96f 100644 --- a/src/gconf-helper.c +++ b/src/gconf-helper.c @@ -82,9 +82,9 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down")); } else { - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out...")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart...")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down...")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out…")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart…")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down…")); } } } diff --git a/src/indicator-session.c b/src/indicator-session.c index bfe0b75..80bf63f 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -529,7 +529,7 @@ switch_property_change (DbusmenuMenuitem * item, 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; } @@ -556,7 +556,7 @@ switch_property_change (DbusmenuMenuitem * item, 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 { diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c index bf3b77f..8477354 100644 --- a/src/user-menu-mgr.c +++ b/src/user-menu-mgr.c @@ -232,7 +232,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self) DBUSMENU_CLIENT_TYPES_DEFAULT); dbusmenu_menuitem_property_set (online_accounts_item, DBUSMENU_MENUITEM_PROP_LABEL, - _("Online Accounts...")); + _("Online Accounts…")); g_signal_connect (G_OBJECT (online_accounts_item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, -- cgit v1.2.3 From 6dc0245f7ec5015a5e2e7a19994b3d417aeb9867 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 21:39:15 -0500 Subject: Ignoring the test-ellipsis script --- .bzrignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.bzrignore b/.bzrignore index 2985cbf..96575ef 100644 --- a/.bzrignore +++ b/.bzrignore @@ -38,6 +38,7 @@ debian/indicator-sus.substvars gtk-logout-helper .deps .libs +test-ellipsis src/libsession.la src/libsession_la-indicator-session.lo src/status-provider-pidgin-marshal.c -- cgit v1.2.3