nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use gettext comments: Closes #5464.

Browse source 
Use comments beginning with '///' before potentially difficult
translatable strings. The comments are extracted by xgettext when it is
passed the option '--add-coments="/"'.
This commit is contained in:
Matthew Pirocchi 2012-06-27 17:22:43 -07:00
parent 4cc29c637f
commit f253f58249
7 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/common/common-date.vala
View file

@ -27,20 +27,20 @@ public string pretty_print(DateTime datetime, ClockFormat clock_format) {
string fmt;
if (equals(datetime, now)) {
if (clock_format == ClockFormat.TWELVE_HOURS) {
// 8:31 am
/// Datetime format for 12-hour time, i.e. 8:31 am.
fmt = _("%l:%M %P");
} else if (clock_format == ClockFormat.TWENTY_FOUR_HOURS) {
// 16:35
/// Datetime format for 24-hour time, i.e. 16:35.
fmt = _("%H:%M");
} else {
// locale default, 8:31 am or 16:35
fmt = C_("DefaultClockFormat", "%l:%M %P");
/// Datetime format for the locale default, i.e. 8:31 am or 16:35.
fmt = C_("Default clock format", "%l:%M %P");
}
} else if (datetime.get_year() == now.get_year()) {
// Nov 8
/// Date format for dates within the current year, i.e. Nov 8.
fmt = _("%b %-e");
} else {
// 02/04/10
/// Date format for dates within a different year, i.e. 02/04/10.
fmt = "%x";
}
@ -49,14 +49,14 @@ public string pretty_print(DateTime datetime, ClockFormat clock_format) {
public string pretty_print_verbose(DateTime datetime, ClockFormat clock_format) {
if (clock_format == ClockFormat.TWELVE_HOURS) {
// November 8, 2010 8:42 am
/// Vebose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am.
return datetime.format(_("%B %-e, %Y %-l:%M %P"));
} else if (clock_format == ClockFormat.TWENTY_FOUR_HOURS) {
// November 8, 2010 16:35
/// Vebose datetime format for 24-hour time, i.e. November 8, 2010 16:35.
return datetime.format(_("%B %-e, %Y %-H:%M"));
} else {
// locale default full month, day and time
return datetime.format(C_("DefaultFullDate", "%B %-e, %Y %-l:%M %P"));
/// Vebose datetime format for the locale default (full month, day and time).
return datetime.format(C_("Default full date", "%B %-e, %Y %-l:%M %P"));
}
}

9
src/engine/rfc822/rfc822-utils.vala
View file

@ -31,8 +31,13 @@ public string quote_email_for_reply(Geary.Email email, bool html_format) {
string quoted = "";
if (email.date != null)
quoted += _("On %s, ").printf(email.date.value.format(_("%a, %b %-e, %Y at %-l:%M %p")));
if (email.date != null) {
/// The datetime that a message being replied to was received.
string DATE_LABEL = _("On %s, ");
/// Format for the datetime that a message being replied to was received.
string DATE_FORMAT = _("%a, %b %-e, %Y at %-l:%M %p");
quoted += DATE_LABEL.printf(email.date.value.format(DATE_FORMAT));
}
if (email.from != null)
quoted += _("%s wrote:").printf(email_addresses_for_reply(email.from, html_format));

1
src/engine/sqlite/api/sqlite-folder.vala
View file

@ -669,6 +669,7 @@ private class Geary.Sqlite.Folder : Object, Geary.ReferenceSemantics {
string? filename = attachment.get_filename();
string mime_type = attachment.get_content_type().to_string();
if (filename == null || filename.length == 0) {
/// Placeholder filename for attachments with no filename.
filename = _("none");
}

22
ui/composer.glade
View file

@ -435,7 +435,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Bold</property>
<property name="related_action">bold</property>
<property name="label" translatable="yes">toolbutton2</property>
<property name="label" translatable="no">toolbutton2</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -450,7 +450,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Italic</property>
<property name="related_action">italic</property>
<property name="label" translatable="yes">toolbutton2</property>
<property name="label" translatable="no">toolbutton2</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -465,7 +465,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Underline</property>
<property name="related_action">underline</property>
<property name="label" translatable="yes">toolbutton1</property>
<property name="label" translatable="no">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -480,7 +480,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Strikethrough</property>
<property name="related_action">strikethrough</property>
<property name="label" translatable="yes">toolbutton1</property>
<property name="label" translatable="no">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -507,7 +507,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Indent</property>
<property name="related_action">indent</property>
<property name="label" translatable="yes">toolbutton6</property>
<property name="label" translatable="no">toolbutton6</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -522,7 +522,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Un-indent</property>
<property name="related_action">outdent</property>
<property name="label" translatable="yes">toolbutton6</property>
<property name="label" translatable="no">toolbutton6</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -549,7 +549,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Fonts</property>
<property name="related_action">font</property>
<property name="label" translatable="yes">toolbutton4</property>
<property name="label" translatable="no">toolbutton4</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -564,7 +564,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Font size</property>
<property name="related_action">fontsize</property>
<property name="label" translatable="yes">toolbutton1</property>
<property name="label" translatable="no">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -579,7 +579,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Color</property>
<property name="related_action">color</property>
<property name="label" translatable="yes">toolbutton4</property>
<property name="label" translatable="no">toolbutton4</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -594,7 +594,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Link</property>
<property name="related_action">insertlink</property>
<property name="label" translatable="yes">toolbutton4</property>
<property name="label" translatable="no">toolbutton4</property>
<property name="use_underline">True</property>
</object>
<packing>
@ -609,7 +609,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Remove formatting</property>
<property name="related_action">removeformat</property>
<property name="label" translatable="yes">toolbutton6</property>
<property name="label" translatable="no">toolbutton6</property>
<property name="use_underline">True</property>
</object>
<packing>

4
ui/login.glade
View file

@ -229,7 +229,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ypad">12</property>
<property name="label" translatable="yes">IMAP settings</property>
<property name="label" translatable="yes">IMAP settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@ -296,7 +296,7 @@
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="width_chars">5</property>
<property name="text" translatable="yes">993</property>
<property name="text">993</property>
<property name="invisible_char_set">True</property>
</object>
<packing>

9
ui/password-dialog.glade
View file

@ -97,7 +97,6 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="xpad">2</property>
<property name="label" translatable="yes">example@example.com</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -198,7 +197,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Service</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -212,7 +210,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Real name</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -308,7 +305,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">server</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -322,7 +318,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">1234</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -336,7 +331,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">off</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -414,7 +408,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">server</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -428,7 +421,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">1234</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -442,7 +434,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">off</property>
</object>
<packing>
<property name="left_attach">1</property>

11
ui/toolbar.glade
View file

@ -82,10 +82,11 @@
</child>
<child>
<object class="GtkToolButton" id="GearyDeleteMessage">
<property name="use_action_appearance">True</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Delete the selected conversation</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Delete</property>
<property name="use_underline">True</property>
</object>
@ -101,12 +102,10 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" comments="Toggles menu for applying labels to emails.">Move the selected conversation</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">False</property>
<property name="icon_name">folder</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</property>
</packing>
</child>
<child>
@ -116,12 +115,10 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" comments="Toggles menu for applying labels to emails.">Label the selected conversation</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">False</property>
<property name="icon_name">multiple-tags</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</property>
</packing>
</child>
<child>
@ -143,12 +140,10 @@
<property name="tooltip_text" translatable="yes" comments="Toggles menu for marking a message as read/unread or starred/unstarred">Mark email</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Mark</property>
<property name="use_underline">False</property>
<property name="icon_name">menu-down</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</property>
</packing>
</child>
<child>
@ -172,7 +167,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">menu</property>
<property name="label" translatable="yes">Menu</property>
<property name="use_underline">True</property>
<property name="icon_name">application-menu</property>
</object>