@@ -126,6 +126,12 @@ getDateProximity(GDateTime* now, GDateTime* time)
126126 return prox;
127127}
128128
129+const char*
130+dgettext_datetime(const char *text)
131+{
132+ return dgettext("indicator-datetime", text);
133+}
134+
129135/**
130136 * _ a time yesterday should be shown as (e.g. “Yesterday 3:55 PM”)
131137 * _ a time today should be shown as just the time (e.g. “3:55 PM”)
@@ -156,14 +162,14 @@ char* generate_full_format_string_at_time (GDateTime* now,
156162 This format string is used for showing, on a 12-hour clock, times that happen yesterday.
157163 (\u2003 is a unicode em space which is slightly wider than a normal space.)
158164 en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM" */
159− g_string_assign (ret, dgettext("indicator-datetime", "Yesterday\u2003%l:%M %p"));
165+ g_string_assign (ret, dgettext_datetime("Yesterday\u2003%l:%M %p"));
160166 break;
161167
162168 case DATE_PROXIMITY_TODAY:
163169 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
164170 This format string is used for showing, on a 12-hour clock, times that happened today.
165171 en_US example: "%l:%M %p" --> "1:00 PM" */
166− g_string_assign (ret, dgettext("indicator-datetime", "%l:%M %p"));
172+ g_string_assign (ret, dgettext_datetime("%l:%M %p"));
167173 break;
168174
169175 case DATE_PROXIMITY_TOMORROW:
@@ -171,7 +177,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
171177 This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
172178 (\u2003 is a unicode em space which is slightly wider than a normal space.)
173179 en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM" */
174− g_string_assign (ret, dgettext("indicator-datetime", "Tomorrow\u2003%l:%M %p"));
180+ g_string_assign (ret, dgettext_datetime("Tomorrow\u2003%l:%M %p"));
175181 break;
176182
177183 case DATE_PROXIMITY_LAST_WEEK:
@@ -180,7 +186,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
180186 This format string is used for showing, on a 12-hour clock, times that happened in the last week.
181187 (\u2003 is a unicode em space which is slightly wider than a normal space.)
182188 en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM" */
183− g_string_assign (ret, dgettext("indicator-datetime", "%a\u2003%l:%M %p"));
189+ g_string_assign (ret, dgettext_datetime("%a\u2003%l:%M %p"));
184190 break;
185191
186192 case DATE_PROXIMITY_FAR:
@@ -189,7 +195,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
189195 (\u2003 is a unicode em space which is slightly wider than a normal space.)
190196 en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
191197 en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM" */
192− g_string_assign (ret, dgettext("indicator-datetime", "%a %d %b\u2003%l:%M %p"));
198+ g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%l:%M %p"));
193199 break;
194200 }
195201 } else {
@@ -200,14 +206,14 @@ char* generate_full_format_string_at_time (GDateTime* now,
200206 This format string is used for showing, on a 24-hour clock, times that happen yesterday.
201207 (\u2003 is a unicode em space which is slightly wider than a normal space.)
202208 en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00" */
203− g_string_assign (ret, dgettext("indicator-datetime", "Yesterday\u2003%H:%M"));
209+ g_string_assign (ret, dgettext_datetime("Yesterday\u2003%H:%M"));
204210 break;
205211
206212 case DATE_PROXIMITY_TODAY:
207213 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
208214 This format string is used for showing, on a 24-hour clock, times that happened today.
209215 en_US example: "%H:%M" --> "13:00" */
210− g_string_assign (ret, dgettext("indicator-datetime", "%H:%M"));
216+ g_string_assign (ret, dgettext_datetime("%H:%M"));
211217 break;
212218
213219 case DATE_PROXIMITY_TOMORROW:
@@ -215,7 +221,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
215221 This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
216222 (\u2003 is a unicode em space which is slightly wider than a normal space.)
217223 en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00" */
218− g_string_assign (ret, dgettext("indicator-datetime", "Tomorrow\u2003%H:%M"));
224+ g_string_assign (ret, dgettext_datetime("Tomorrow\u2003%H:%M"));
219225 break;
220226
221227 case DATE_PROXIMITY_LAST_WEEK:
@@ -224,7 +230,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
224230 This format string is used for showing, on a 24-hour clock, times that happened in the last week.
225231 (\u2003 is a unicode em space which is slightly wider than a normal space.)
226232 en_US example: "%a\u2003%H:%M" --> "Fri 13:00" */
227− g_string_assign (ret, dgettext("indicator-datetime", "%a\u2003%H:%M"));
233+ g_string_assign (ret, dgettext_datetime("%a\u2003%H:%M"));
228234 break;
229235
230236 case DATE_PROXIMITY_FAR:
@@ -233,7 +239,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
233239 (\u2003 is a unicode em space which is slightly wider than a normal space.)
234240 en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"
235241 en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00" */
236− g_string_assign (ret, dgettext("indicator-datetime", "%a %d %b\u2003%H:%M"));
242+ g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%H:%M"));
237243 break;
238244 }
239245 }