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

Subscribers

People subscribed via source and target branches