217aeab · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

use dgettext

217aeabNick Dedekind12 years ago

plugins/Utils/relativetimeformatter.cpp+16−10

compare with xenial

unifiedsplit

@@ -126,6 +126,12 @@ getDateProximity(GDateTime* now, GDateTime* time)

126 return prox;

127}

128

129+const char*

130+dgettext_datetime(const char *text)

131+{

132+ return dgettext("indicator-datetime", text);

133+}

134+

129/**

135/**

130 * _ a time yesterday should be shown as (e.g. “Yesterday 3:55 PM”)

136 * _ a time yesterday should be shown as (e.g. “Yesterday 3:55 PM”)

131 * _ a time today should be shown as just the time (e.g. “3:55 PM”)

137 * _ 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,

156 This format string is used for showing, on a 12-hour clock, times that happen yesterday.

162 This format string is used for showing, on a 12-hour clock, times that happen yesterday.

157 (\u2003 is a unicode em space which is slightly wider than a normal space.)

163 (\u2003 is a unicode em space which is slightly wider than a normal space.)

158 en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM" */

164 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"));

160 break;

166 break;

161

167

162 case DATE_PROXIMITY_TODAY:

168 case DATE_PROXIMITY_TODAY:

163 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

169 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

164 This format string is used for showing, on a 12-hour clock, times that happened today.

170 This format string is used for showing, on a 12-hour clock, times that happened today.

165 en_US example: "%l:%M %p" --> "1:00 PM" */

171 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"));

167 break;

173 break;

168

174

169 case DATE_PROXIMITY_TOMORROW:

175 case DATE_PROXIMITY_TOMORROW:

@@ -171,7 +177,7 @@ char* generate_full_format_string_at_time (GDateTime* now,

171 This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.

177 This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.

172 (\u2003 is a unicode em space which is slightly wider than a normal space.)

178 (\u2003 is a unicode em space which is slightly wider than a normal space.)

173 en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM" */

179 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"));

175 break;

181 break;

176

182

177 case DATE_PROXIMITY_LAST_WEEK:

183 case DATE_PROXIMITY_LAST_WEEK:

@@ -180,7 +186,7 @@ char* generate_full_format_string_at_time (GDateTime* now,

180 This format string is used for showing, on a 12-hour clock, times that happened in the last week.

186 This format string is used for showing, on a 12-hour clock, times that happened in the last week.

181 (\u2003 is a unicode em space which is slightly wider than a normal space.)

187 (\u2003 is a unicode em space which is slightly wider than a normal space.)

182 en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM" */

188 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"));

184 break;

190 break;

185

191

186 case DATE_PROXIMITY_FAR:

192 case DATE_PROXIMITY_FAR:

@@ -189,7 +195,7 @@ char* generate_full_format_string_at_time (GDateTime* now,

189 (\u2003 is a unicode em space which is slightly wider than a normal space.)

195 (\u2003 is a unicode em space which is slightly wider than a normal space.)

190 en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"

196 en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"

191 en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM" */

197 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"));

193 break;

199 break;

194 }

200 }

195 } else {

201 } else {

@@ -200,14 +206,14 @@ char* generate_full_format_string_at_time (GDateTime* now,

200 This format string is used for showing, on a 24-hour clock, times that happen yesterday.

206 This format string is used for showing, on a 24-hour clock, times that happen yesterday.

201 (\u2003 is a unicode em space which is slightly wider than a normal space.)

207 (\u2003 is a unicode em space which is slightly wider than a normal space.)

202 en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00" */

208 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"));

204 break;

210 break;

205

211

206 case DATE_PROXIMITY_TODAY:

212 case DATE_PROXIMITY_TODAY:

207 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

213 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

208 This format string is used for showing, on a 24-hour clock, times that happened today.

214 This format string is used for showing, on a 24-hour clock, times that happened today.

209 en_US example: "%H:%M" --> "13:00" */

215 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"));

211 break;

217 break;

212

218

213 case DATE_PROXIMITY_TOMORROW:

219 case DATE_PROXIMITY_TOMORROW:

@@ -215,7 +221,7 @@ char* generate_full_format_string_at_time (GDateTime* now,

215 This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.

221 This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.

216 (\u2003 is a unicode em space which is slightly wider than a normal space.)

222 (\u2003 is a unicode em space which is slightly wider than a normal space.)

217 en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00" */

223 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"));

219 break;

225 break;

220

226

221 case DATE_PROXIMITY_LAST_WEEK:

227 case DATE_PROXIMITY_LAST_WEEK:

@@ -224,7 +230,7 @@ char* generate_full_format_string_at_time (GDateTime* now,

224 This format string is used for showing, on a 24-hour clock, times that happened in the last week.

230 This format string is used for showing, on a 24-hour clock, times that happened in the last week.

225 (\u2003 is a unicode em space which is slightly wider than a normal space.)

231 (\u2003 is a unicode em space which is slightly wider than a normal space.)

226 en_US example: "%a\u2003%H:%M" --> "Fri 13:00" */

232 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"));

228 break;

234 break;

229

235

230 case DATE_PROXIMITY_FAR:

236 case DATE_PROXIMITY_FAR:

@@ -233,7 +239,7 @@ char* generate_full_format_string_at_time (GDateTime* now,

233 (\u2003 is a unicode em space which is slightly wider than a normal space.)

239 (\u2003 is a unicode em space which is slightly wider than a normal space.)

234 en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"

240 en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"

235 en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00" */

241 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"));

237 break;

243 break;

238 }

244 }

239 }

245 }

po/unity8.pot+1−41

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2014-09-03 13:16+0100\n"

11+"POT-Creation-Date: 2014-09-03 14:48+0100\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -30,46 +30,6 @@ msgstr ""

30msgid "Unpin shortcut"

31msgstr ""

33−#: plugins/Utils/relativetimeformatter.cpp:157

34−msgid "Yesterday\\u2003%l:%M %p"

35−msgstr ""

36−

37−#: plugins/Utils/relativetimeformatter.cpp:164

38−msgid "%l:%M %p"

39−msgstr ""

40−

41−#: plugins/Utils/relativetimeformatter.cpp:172

42−msgid "Tomorrow\\u2003%l:%M %p"

43−msgstr ""

44−

45−#: plugins/Utils/relativetimeformatter.cpp:181

46−msgid "%a\\u2003%l:%M %p"

47−msgstr ""

48−

49−#: plugins/Utils/relativetimeformatter.cpp:190

50−msgid "%a %d %b\\u2003%l:%M %p"

51−msgstr ""

52−

53−#: plugins/Utils/relativetimeformatter.cpp:201

54−msgid "Yesterday\\u2003%H:%M"

55−msgstr ""

56−

57−#: plugins/Utils/relativetimeformatter.cpp:208

58−msgid "%H:%M"

59−msgstr ""

60−

61−#: plugins/Utils/relativetimeformatter.cpp:216

62−msgid "Tomorrow\\u2003%H:%M"

63−msgstr ""

64−

65−#: plugins/Utils/relativetimeformatter.cpp:225

66−msgid "%a\\u2003%H:%M"

67−msgstr ""

68−

69−#: plugins/Utils/relativetimeformatter.cpp:234

70−msgid "%a %d %b\\u2003%H:%M"

71−msgstr ""

72−

73#: qml/Components/Dialogs.qml:70

33#: qml/Components/Dialogs.qml:70

74msgid "Log out"

34msgid "Log out"

75msgstr ""

35msgstr ""