Indicator Date and Time

Merge lp:~dobey/indicator-datetime/fix-gsettings into lp:indicator-datetime

  1. fix-gsettings
  2. Merge into trunk.16.10
Proposed by dobey
Status: Needs review
Proposed branch: lp:~dobey/indicator-datetime/fix-gsettings
Merge into: lp:indicator-datetime
Prerequisite: lp:~dobey/indicator-datetime/fix-i18n
Diff against target: 552 lines (+388/-55)
7 files modified
cmake/UseGSettings.cmake (+0/-23)
data/CMakeLists.txt (+19/-10)
data/com.canonical.indicator.datetime.gschema.xml.in.in (+1/-1)
debian/control (+1/-1)
po/CMakeLists.txt (+3/-1)
po/indicator-datetime.pot (+360/-1)
tests/CMakeLists.txt (+4/-18)
To merge this branch: bzr merge lp:~dobey/indicator-datetime/fix-gsettings
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+317144@code.launchpad.net

Commit message

Use the cmake-extras gsettings module.
Ensure the schema file's strings get pulled for translation.
Ensure the translations from utils.c get pulled as well.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:480
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/19/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1673/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1680
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1455/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1455/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1455/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1455/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1455/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1455/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/19/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Charles Kerr (charlesk) wrote :

jenkins failures appear to be a false alarm due to missing cmake-extras 1.2

Reply
Revision history for this message
Charles Kerr (charlesk) wrote :

Comments inline

review: Approve
Reply
lp:~dobey/indicator-datetime/fix-gsettings updated
481. By dobey

Updates for newer version of cmake-extras.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:481
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/21/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1776/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1783
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1559/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1559/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1559/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1559/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1559/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1559/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/21/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp:~dobey/indicator-datetime/fix-gsettings updated
482. By dobey

Merge up trunk.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:482
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/22/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1795/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1802
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1578/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1578/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1578/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1578/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1578/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1578/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/22/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:483
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/23/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1797/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1804
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1580/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1580/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1580/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1580/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1580/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1580/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/23/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

482. By dobey

Merge up trunk.

481. By dobey

Updates for newer version of cmake-extras.

480. By dobey

Use the cmake-extras gsettings module.
Ensure the schema file's strings get pulled for translation.
Ensure the translations from utils.c get pulled as well.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'cmake/UseGSettings.cmake'
2--- cmake/UseGSettings.cmake 2013-10-18 19:22:54 +0000
3+++ cmake/UseGSettings.cmake 1970-01-01 00:00:00 +0000
4@@ -1,23 +0,0 @@
5-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
6-
7-macro(add_schema SCHEMA_NAME)
8-
9- set(PKG_CONFIG_EXECUTABLE pkg-config)
10- set(GSETTINGS_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/glib-2.0/schemas")
11-
12- # Run the validator and error if it fails
13- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_compile_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
14- execute_process (COMMAND ${_glib_compile_schemas} --dry-run --schema-file=${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
15-
16- if (_schemas_invalid)
17- message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
18- endif (_schemas_invalid)
19-
20- # Actually install and recomple schemas
21- message (STATUS "${GSETTINGS_DIR} is the GSettings install dir")
22- install (FILES ${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
23-
24- install (CODE "message (STATUS \"Compiling GSettings schemas\")")
25- install (CODE "execute_process (COMMAND ${_glib_compile_schemas} ${GSETTINGS_DIR})")
26-endmacro()
27-
28
29=== modified file 'data/CMakeLists.txt'
30--- data/CMakeLists.txt 2017-02-03 20:17:55 +0000
31+++ data/CMakeLists.txt 2017-03-16 21:47:49 +0000
32@@ -2,19 +2,28 @@
33 ## GSettings schema
34 ##
35
36-include (UseGSettings)
37+find_package (GSettings REQUIRED)
38 set (SCHEMA_NAME "com.canonical.indicator.datetime.gschema.xml")
39-set (SCHEMA_FILE_IN_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in.in")
40-set (SCHEMA_FILE_IN "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}.in")
41-set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
42-# generate the .xml.in file so cmake constants are included
43+set (SCHEMA_FILE_IN_IN "${SCHEMA_NAME}.in.in")
44+set (SCHEMA_FILE_IN "${SCHEMA_NAME}.in")
45+set (SCHEMA_FILE "${SCHEMA_NAME}")
46+
47+# generate the .xml file using intltool
48+# this is still necessary because intltool_merge_translations only handles
49+# .desktop files (lp: #1664325)
50+find_package(Intltool REQUIRED)
51 configure_file(${SCHEMA_FILE_IN_IN} ${SCHEMA_FILE_IN})
52-# generate the .xml file using intltool
53-set (ENV{LC_ALL} "C")
54-execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}")
55+intltool_merge_translations(
56+ "${SCHEMA_FILE_IN}"
57+ "${SCHEMA_FILE}"
58+ ALL
59+ UTF8
60+ STYLE "xml"
61+ NO_TRANSLATIONS
62+)
63
64-# let UseGSettings do the rest
65-add_schema (${SCHEMA_FILE})
66+add_schema (${SCHEMA_NAME})
67+compile_schemas(${CMAKE_CURRENT_BINARY_DIR})
68
69 ##
70 ## Systemd Unit File
71
72=== modified file 'data/com.canonical.indicator.datetime.gschema.xml.in.in'
73--- data/com.canonical.indicator.datetime.gschema.xml.in.in 2015-10-13 19:46:12 +0000
74+++ data/com.canonical.indicator.datetime.gschema.xml.in.in 2017-03-16 21:47:49 +0000
75@@ -5,7 +5,7 @@
76 <value nick="24-hour" value="2" />
77 <value nick="custom" value="3" />
78 </enum>
79- <schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime">
80+ <schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="@GETTEXT_PACKAGE@">
81 <key name="show-clock" type="b">
82 <default>true</default>
83 <_summary>Show the clock in the panel</_summary>
84
85=== modified file 'debian/control'
86--- debian/control 2017-02-27 14:29:11 +0000
87+++ debian/control 2017-03-16 21:47:49 +0000
88@@ -3,7 +3,7 @@
89 Priority: optional
90 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
91 Build-Depends: cmake,
92- cmake-extras (>= 1.1),
93+ cmake-extras (>= 1.3),
94 dbus,
95 debhelper (>= 9),
96 dh-translations,
97
98=== modified file 'po/CMakeLists.txt'
99--- po/CMakeLists.txt 2017-02-09 17:28:21 +0000
100+++ po/CMakeLists.txt 2017-03-16 21:47:49 +0000
101@@ -1,9 +1,11 @@
102 find_package(Intltool REQUIRED)
103
104+# NOTE: Need to add T_ to keywords, provided/used by utils.c
105 intltool_update_potfile(
106- KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
107+ KEYWORDS "_" "_:1,2" "N_" "N_:1,2" "T_"
108 GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
109 COPYRIGHT_HOLDER "Canonical Ltd."
110+ FILE_GLOBS "${CMAKE_SOURCE_DIR}/*.gschema.xml.in.in"
111 FILTER "test/*"
112 )
113
114
115=== modified file 'po/indicator-datetime.pot'
116--- po/indicator-datetime.pot 2017-03-09 16:06:55 +0000
117+++ po/indicator-datetime.pot 2017-03-16 21:47:49 +0000
118@@ -8,7 +8,7 @@
119 msgstr ""
120 "Project-Id-Version: PACKAGE VERSION\n"
121 "Report-Msgid-Bugs-To: \n"
122-"POT-Creation-Date: 2017-02-09 12:28-0500\n"
123+"POT-Creation-Date: 2017-02-13 14:08-0500\n"
124 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
125 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
126 "Language-Team: LANGUAGE <LL@li.org>\n"
127@@ -17,6 +17,206 @@
128 "Content-Type: text/plain; charset=UTF-8\n"
129 "Content-Transfer-Encoding: 8bit\n"
130
131+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:1
132+msgid "Show the clock in the panel"
133+msgstr ""
134+
135+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:2
136+msgid "Controls whether the clock indicator appears in the panel or not."
137+msgstr ""
138+
139+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:3
140+msgid "What the time format should be"
141+msgstr ""
142+
143+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:4
144+msgid ""
145+"Controls the time format that is displayed in the indicator. For almost all "
146+"users this should be the default for their locale. If you think the setting "
147+"is wrong for your locale please join or talk to the translation team for "
148+"your language. If you just want something different you can adjust this to "
149+"be either 12 or 24 time. Or, you can use a custom format string and set the "
150+"custom-time-format setting."
151+msgstr ""
152+
153+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:5
154+msgid "The format string passed to strftime"
155+msgstr ""
156+
157+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:6
158+msgid ""
159+"The format of the time and/or date that is visible on the panel when using "
160+"the indicator. For most users this will be a set of predefined values as "
161+"determined by the configuration utility, but advanced users can change it to "
162+"anything strftime can accept. Look at the man page on strftime for more "
163+"information."
164+msgstr ""
165+
166+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:7
167+msgid "Show the number of seconds in the indicator"
168+msgstr ""
169+
170+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:8
171+msgid ""
172+"Makes the datetime indicator show the number of seconds in the indicator. "
173+"It's important to note that this will cause additional battery drain as the "
174+"time will update 60 times as often, so it is not recommended. Also, this "
175+"setting will be ignored if the time-format value is set to custom."
176+msgstr ""
177+
178+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:9
179+msgid "Show the day of the week in the indicator"
180+msgstr ""
181+
182+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:10
183+msgid ""
184+"Puts the day of the week on the panel along with the time and/or date "
185+"depending on settings. This setting will be ignored if the time-format value "
186+"is set to custom."
187+msgstr ""
188+
189+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:11
190+msgid "Show the month and date in the indicator"
191+msgstr ""
192+
193+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:12
194+msgid ""
195+"Puts the month and the date in the panel along with the time and/or day of "
196+"the week depending on settings. This setting will be ignored if the time-"
197+"format value is set to custom."
198+msgstr ""
199+
200+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:13
201+msgid "Show the year in the indicator"
202+msgstr ""
203+
204+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:14
205+msgid ""
206+"Puts the year in the panel along with the month and the date. This setting "
207+"will be ignored if either the time-format value is set to custom or if show-"
208+"date is set to false."
209+msgstr ""
210+
211+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:15
212+msgid "Show the monthly calendar in the indicator"
213+msgstr ""
214+
215+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:16
216+msgid "Puts the monthly calendar in indicator-datetime's menu."
217+msgstr ""
218+
219+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:17
220+msgid "Show week numbers in calendar"
221+msgstr ""
222+
223+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:18
224+msgid ""
225+"Shows the week numbers in the monthly calendar in indicator-datetime's menu."
226+msgstr ""
227+
228+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:19
229+msgid "Show events in the indicator"
230+msgstr ""
231+
232+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:20
233+msgid "Shows events from Evolution in indicator-datetime's menu."
234+msgstr ""
235+
236+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:21
237+msgid "Show the auto-detected location in the indicator"
238+msgstr ""
239+
240+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:22
241+msgid ""
242+"Shows your current location (determined from geoclue and /etc/timezone) in "
243+"indicator-datetime's menu."
244+msgstr ""
245+
246+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:23
247+msgid "Show locations in the indicator"
248+msgstr ""
249+
250+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:24
251+msgid "Shows custom defined locations in indicator-datetime's menu."
252+msgstr ""
253+
254+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:25
255+msgid "A List of locations"
256+msgstr ""
257+
258+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:26
259+msgid ""
260+"Adds the list of locations the user has configured to display in the "
261+"indicator-datetime menu."
262+msgstr ""
263+
264+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:27
265+msgid "The name of the current timezone"
266+msgstr ""
267+
268+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:28
269+msgid ""
270+"Some timezones can be known by many different cities or names. This setting "
271+"describes how the current zone prefers to be named. Format is \"TIMEZONE NAME"
272+"\" (e.g. \"America/New_York Boston\" to name the New_York zone Boston)."
273+msgstr ""
274+
275+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:29
276+msgid "What kind of haptic feedback, if any, to trigger with an alarm."
277+msgstr ""
278+
279+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:30
280+msgid ""
281+"What kind of haptic feedback, if any, to trigger with an alarm. Two modes "
282+"are currently supported: 'pulse', 'none'."
283+msgstr ""
284+
285+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:31
286+msgid "The calendar's default sound file."
287+msgstr ""
288+
289+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:32
290+msgid ""
291+"If a calendar or reminder event doesn't specify its own sound file, this "
292+"file will be used as the fallback sound."
293+msgstr ""
294+
295+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:33
296+msgid "The alarm's default sound file."
297+msgstr ""
298+
299+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:34
300+msgid ""
301+"If an alarm doesn't specify its own sound file, this file will be used as "
302+"the fallback sound."
303+msgstr ""
304+
305+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:35
306+msgid "The alarm's default volume level."
307+msgstr ""
308+
309+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:36
310+msgid "The volume at which alarms will be played."
311+msgstr ""
312+
313+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:37
314+msgid "The alarm's duration."
315+msgstr ""
316+
317+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:38
318+msgid ""
319+"How long the alarm's sound will be looped if its snap decision is not "
320+"dismissed by the user."
321+msgstr ""
322+
323+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:39
324+msgid "The snooze duration."
325+msgstr ""
326+
327+#: ../data/com.canonical.indicator.datetime.gschema.xml.in.in.h:40
328+msgid "How long to wait when the user hits the Snooze button."
329+msgstr ""
330+
331 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
332 #. Format string for the day on the first menuitem in the datetime indicator.
333 #. This format string gives the full weekday, date, month, and year.
334@@ -81,3 +281,162 @@
335 #: ../src/snap.cpp:163
336 msgid "Snooze"
337 msgstr ""
338+
339+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
340+#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
341+#. This format string shows the abbreviated weekday, day, abbreviated month, and year.
342+#. en_US example: "%a %b %e %Y" --> "Sat Oct 31 2020"
343+#. en_GB example: "%a %e %b %Y" --> "Sat 31 Oct 2020"
344+#. zh_CN example(?): "%Y年%m月%d日 周%a" --> "2020年10月31日 周六"
345+#: ../src/formatter-desktop.cpp:138
346+msgid "%a %b %e %Y"
347+msgstr ""
348+
349+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
350+#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
351+#. This format string shows the abbreviated weekday, day, and abbreviated month.
352+#. en_US example: "%a %b %e" --> "Sat Oct 31"
353+#. en_GB example: "%a %e %b" --> "Sat 31 Oct"
354+#. zh_CN example(?): "%m月%d日 周%a" --> "03月27日 周六"
355+#: ../src/formatter-desktop.cpp:147
356+msgid "%a %b %e"
357+msgstr ""
358+
359+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
360+#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
361+#. This format string shows the abbreviated weekday.
362+#. zh_CN example(?): "周%a" --> "周六"
363+#: ../src/formatter-desktop.cpp:154
364+#, c-format
365+msgid "%a"
366+msgstr ""
367+
368+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
369+#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
370+#. This format string shows the day, abbreviated month, and year.
371+#. en_US example: "%b %e %Y" --> "Oct 31 2020"
372+#. en_GB example: "%e %b %Y" --> "31 Oct 2020"
373+#. zh_CN example(?): "%Y年%m月%d日" --> "2020年10月31日"
374+#: ../src/formatter-desktop.cpp:163
375+msgid "%b %e %Y"
376+msgstr ""
377+
378+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
379+#. That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
380+#. This format string shows the abbreviated month and day.
381+#. en_US example: "%b %e" --> "Mar 27"
382+#. en_GB example: "%e %b" --> "27 Mar"
383+#. zh_CN example(?): "%m月%d日" --> "03月27日"
384+#: ../src/formatter-desktop.cpp:172
385+msgid "%b %e"
386+msgstr ""
387+
388+#. This strftime(3) format string shows the year.
389+#: ../src/formatter-desktop.cpp:176
390+msgid "%Y"
391+msgstr ""
392+
393+#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
394+#: ../src/formatter.cpp:234
395+msgid "%l:%M:%S %p"
396+msgstr ""
397+
398+#. TRANSLATORS: a strftime(3) format for 12hr time
399+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
400+#. This format string is used for showing, on a 12-hour clock, events/appointments that happen today.
401+#. en_US example: "%l:%M %p" --> "1:00 PM"
402+#: ../src/formatter.cpp:237 ../src/utils.c:304
403+msgid "%l:%M %p"
404+msgstr ""
405+
406+#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
407+#: ../src/formatter.cpp:240
408+msgid "%H:%M:%S"
409+msgstr ""
410+
411+#. TRANSLATORS: a strftime(3) format for 24hr time
412+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
413+#. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
414+#. en_US example: "%H:%M" --> "13:00"
415+#: ../src/formatter.cpp:243 ../src/utils.c:344
416+msgid "%H:%M"
417+msgstr ""
418+
419+#: ../src/utils.c:274
420+msgid "Today"
421+msgstr ""
422+
423+#: ../src/utils.c:278
424+msgid "Tomorrow"
425+msgstr ""
426+
427+#. This is a strftime(3) format string indicating the unabbreviated weekday.
428+#: ../src/utils.c:283
429+#, c-format
430+msgid "%A"
431+msgstr ""
432+
433+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
434+#. This format string is used for showing full-day events that are over a week away.
435+#. en_US example: "%a %b %d" --> "Sat Oct 31"
436+#. en_GB example: "%a %d %b" --> "Sat 31 Oct"
437+#. zh_CN example(?): "%m月%d日 周%a" --> "10月31日 周六"
438+#: ../src/utils.c:292
439+msgid "%a %d %b"
440+msgstr ""
441+
442+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
443+#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
444+#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
445+#. slightly wider than a normal space.)
446+#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 1:00 PM"
447+#: ../src/utils.c:313
448+msgid "Tomorrow %l:%M %p"
449+msgstr ""
450+
451+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
452+#. This format string is used for showing, on a 12-hour clock, events/appointments that happen this week.
453+#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
454+#. slightly wider than a normal space.)
455+#. en_US example: "Tomorrow %l:%M %p" --> "Fri 1:00 PM"
456+#: ../src/utils.c:322
457+msgid "%a %l:%M %p"
458+msgstr ""
459+
460+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
461+#. This format string is used for showing, on a 12-hour clock, events/appointments that happen over a week from now.
462+#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
463+#. slightly wider than a normal space.)
464+#. en_US example: "%a %b %d %l:%M %p" --> "Fri Oct 31 1:00 PM"
465+#. en_GB example: "%a %d %b %l:%M %p" --> "Fri 31 Oct 1:00 PM"
466+#: ../src/utils.c:332
467+msgid "%a %d %b %l:%M %p"
468+msgstr ""
469+
470+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
471+#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
472+#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
473+#. slightly wider than a normal space.)
474+#. en_US example: "Tomorrow %l:%M %p" --> "Tomorrow 13:00"
475+#: ../src/utils.c:353
476+msgid "Tomorrow %H:%M"
477+msgstr ""
478+
479+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
480+#. This format string is used for showing, on a 24-hour clock, events/appointments that happen this week.
481+#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
482+#. slightly wider than a normal space.)
483+#. en_US example: "%a %H:%M" --> "Fri 13:00"
484+#: ../src/utils.c:362
485+msgid "%a %H:%M"
486+msgstr ""
487+
488+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
489+#. This format string is used for showing, on a 24-hour clock, events/appointments that happen over a week from now.
490+#. (Note: the space between the day and the time is an em space (unicode character 2003), which is
491+#. slightly wider than a normal space.)
492+#. en_US example: "%a %b %d %H:%M" --> "Fri Oct 31 13:00"
493+#. en_GB example: "%a %d %b %H:%M" --> "Fri 31 Oct 13:00"
494+#: ../src/utils.c:372
495+msgid "%a %d %b %H:%M"
496+msgstr ""
497
498=== modified file 'tests/CMakeLists.txt'
499--- tests/CMakeLists.txt 2017-02-10 16:15:07 +0000
500+++ tests/CMakeLists.txt 2017-03-16 21:47:49 +0000
501@@ -7,23 +7,9 @@
502 dbustest-1>=14.04.0)
503 include_directories (SYSTEM ${DBUSTEST_INCLUDE_DIRS})
504
505-# build the necessary schemas
506-set_directory_properties (PROPERTIES
507- ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled)
508-set_source_files_properties (gschemas.compiled GENERATED)
509-
510 # GSettings:
511-# compile the indicator-datetime schema into a gschemas.compiled file in this directory,
512-# and help the tests to find that file by setting -DSCHEMA_DIR
513-set (SCHEMA_DIR ${CMAKE_CURRENT_BINARY_DIR})
514+set (SCHEMA_DIR ${CMAKE_BINARY_DIR}/data)
515 add_definitions(-DSCHEMA_DIR="${SCHEMA_DIR}")
516-execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas
517- OUTPUT_VARIABLE COMPILE_SCHEMA_EXECUTABLE
518- OUTPUT_STRIP_TRAILING_WHITESPACE)
519-add_custom_command (OUTPUT gschemas.compiled
520- DEPENDS ${CMAKE_BINARY_DIR}/data/com.canonical.indicator.datetime.gschema.xml
521- COMMAND cp -f ${CMAKE_BINARY_DIR}/data/*gschema.xml ${SCHEMA_DIR}
522- COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR})
523
524 # look for headers in our src dir, and also in the directories where we autogenerate files...
525 include_directories (${CMAKE_SOURCE_DIR}/src)
526@@ -38,7 +24,7 @@
527 function(add_test_by_name name)
528 set (TEST_NAME ${name})
529 set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
530- add_executable (${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
531+ add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
532 add_test (${TEST_NAME} ${TEST_NAME})
533 target_link_libraries (${TEST_NAME} indicatordatetimeservice ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
534 endfunction()
535@@ -77,7 +63,7 @@
536 set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
537 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics.in"
538 "${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.ics")
539- add_executable(${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
540+ add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
541 target_link_libraries (${TEST_NAME} indicatordatetimeservice ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
542 add_test (${TEST_NAME}
543 ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-ics-test.sh
544@@ -106,7 +92,7 @@
545 #function(add_dbusmock_test_by_name name)
546 # set (TEST_NAME ${name})
547 # set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
548-# add_executable (${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
549+# add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
550 # add_test (${TEST_NAME} ${TEST_NAME})
551 # target_link_libraries (${TEST_NAME} indicatordatetimeservice ${SERVICE_DEPS_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
552 #endfunction()

Subscribers

People subscribed via source and target branches