Session Menu

Merge lp:~ted/indicator-session/ellipsis-test into lp:indicator-session/0.1

  1. ellipsis-test
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 181
Proposed branch: lp:~ted/indicator-session/ellipsis-test
Merge into: lp:indicator-session/0.1
Diff against target: 79 lines (+18/-5)
4 files modified
.bzrignore (+1/-0)
Makefile.am (+12/-0)
src/dialog.c (+3/-3)
src/indicator-session.c (+2/-2)
To merge this branch: bzr merge lp:~ted/indicator-session/ellipsis-test
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+72281@code.launchpad.net

Description of the change

Fix the last set of ellipsis and make a test to stop them from creeping back in.

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) wrote :

Sorry, I thought I fixed all of these.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-08-10 17:11:27 +0000
3+++ .bzrignore 2011-08-20 03:51:25 +0000
4@@ -38,6 +38,7 @@
5 gtk-logout-helper
6 .deps
7 .libs
8+test-ellipsis
9 src/libsession.la
10 src/libsession_la-indicator-session.lo
11 src/status-provider-pidgin-marshal.c
12
13=== modified file 'Makefile.am'
14--- Makefile.am 2010-09-21 21:14:43 +0000
15+++ Makefile.am 2011-08-20 03:51:25 +0000
16@@ -33,3 +33,15 @@
17 else \
18 echo Failed to generate AUTHORS: not a branch >&2; \
19 fi
20+
21+TESTS = \
22+ test-ellipsis
23+
24+test-ellipsis: po
25+ @echo "#!/bin/bash" > $@
26+ @echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
27+ @echo "grep -c -e \"^msgid.*\.\.\.\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@
28+ @echo "exit 0" >> $@
29+ @chmod +x $@
30+
31+CLEANFILES = $(TESTS)
32
33=== modified file 'src/device-menu-mgr.c'
34=== modified file 'src/dialog.c'
35--- src/dialog.c 2011-08-10 18:10:55 +0000
36+++ src/dialog.c 2011-08-20 03:51:25 +0000
37@@ -53,15 +53,15 @@
38 they are also going to get a password dialog to do the action. */
39 static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
40 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"),
41- /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart..."),
42- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down...")
43+ /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart…"),
44+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down…")
45 };
46
47 /* TRANSLATORS: This button appears on the logout dialog when
48 there are updates that require restart. It will do a restart
49 in place of a log out. */
50 static const gchar * restart_updates = N_("Restart Instead");
51-static const gchar * restart_auth = N_("Restart Instead...");
52+static const gchar * restart_auth = N_("Restart Instead…");
53 static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts.");
54
55 static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = {
56
57=== modified file 'src/indicator-session.c'
58--- src/indicator-session.c 2011-08-12 12:23:35 +0000
59+++ src/indicator-session.c 2011-08-20 03:51:25 +0000
60@@ -527,7 +527,7 @@
61
62 if (variant == NULL || g_variant_get_string(variant, NULL) == NULL ||
63 g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) {
64- finalstring = _("Switch User...");
65+ finalstring = _("Switch User…");
66 set_ellipsize = FALSE;
67 }
68
69@@ -554,7 +554,7 @@
70 gdouble ems = width / pixels_per_em;
71 g_debug("Username width %fem", ems);
72
73- finalstring = g_strdup_printf(_("Switch From %s..."), username);
74+ finalstring = g_strdup_printf(_("Switch From %s…"), username);
75 if (ems >= 20.0f) {
76 set_ellipsize = TRUE;
77 } else {
78
79=== modified file 'src/user-menu-mgr.c'

Subscribers

People subscribed via source and target branches