Fix build on non-RTC targets.
talk_time and talk_date are now exposed to plugins, so the strings they
reference need to be moved from rtc-only to global.
Change-Id: I88166dc21455d595878d3d1ec557289cd3a5ff6b
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 7a3b257..bb11e90 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3980,16 +3980,13 @@
desc: select the time format of time in status bar
user: core
<source>
- *: none
- rtc: "Time Format"
+ *: "Time Format"
</source>
<dest>
- *: none
- rtc: "Time Format"
+ *: "Time Format"
</dest>
<voice>
- *: none
- rtc: "Time Format"
+ *: "Time Format"
</voice>
</phrase>
<phrase>
@@ -3997,16 +3994,13 @@
desc: option for 12 hour clock
user: core
<source>
- *: none
- rtc: "12 Hour Clock"
+ *: "12 Hour Clock"
</source>
<dest>
- *: none
- rtc: "12 Hour Clock"
+ *: "12 Hour Clock"
</dest>
<voice>
- *: none
- rtc: "12 Hour Clock"
+ *: "12 Hour Clock"
</voice>
</phrase>
<phrase>
@@ -4014,16 +4008,13 @@
desc: option for 24 hour clock
user: core
<source>
- *: none
- rtc: "24 Hour Clock"
+ *: "24 Hour Clock"
</source>
<dest>
- *: none
- rtc: "24 Hour Clock"
+ *: "24 Hour Clock"
</dest>
<voice>
- *: none
- rtc: "24 Hour Clock"
+ *: "24 Hour Clock"
</voice>
</phrase>
<phrase>
@@ -4220,16 +4211,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Jan"
+ *: "Jan"
</source>
<dest>
- *: none
- rtc: "Jan"
+ *: "Jan"
</dest>
<voice>
- *: none
- rtc: "January"
+ *: "January"
</voice>
</phrase>
<phrase>
@@ -4237,16 +4225,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Feb"
+ *: "Feb"
</source>
<dest>
- *: none
- rtc: "Feb"
+ *: "Feb"
</dest>
<voice>
- *: none
- rtc: "February"
+ *: "February"
</voice>
</phrase>
<phrase>
@@ -4254,16 +4239,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Mar"
+ *: "Mar"
</source>
<dest>
- *: none
- rtc: "Mar"
+ *: "Mar"
</dest>
<voice>
- *: none
- rtc: "March"
+ *: "March"
</voice>
</phrase>
<phrase>
@@ -4271,16 +4253,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Apr"
+ *: "Apr"
</source>
<dest>
- *: none
- rtc: "Apr"
+ *: "Apr"
</dest>
<voice>
- *: none
- rtc: "April"
+ *: "April"
</voice>
</phrase>
<phrase>
@@ -4288,16 +4267,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "May"
+ *: "May"
</source>
<dest>
- *: none
- rtc: "May"
+ *: "May"
</dest>
<voice>
- *: none
- rtc: "May"
+ *: "May"
</voice>
</phrase>
<phrase>
@@ -4305,16 +4281,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Jun"
+ *: "Jun"
</source>
<dest>
- *: none
- rtc: "Jun"
+ *: "Jun"
</dest>
<voice>
- *: none
- rtc: "June"
+ *: "June"
</voice>
</phrase>
<phrase>
@@ -4322,16 +4295,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Jul"
+ *: "Jul"
</source>
<dest>
- *: none
- rtc: "Jul"
+ *: "Jul"
</dest>
<voice>
- *: none
- rtc: "July"
+ *: "July"
</voice>
</phrase>
<phrase>
@@ -4339,16 +4309,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Aug"
+ *: "Aug"
</source>
<dest>
- *: none
- rtc: "Aug"
+ *: "Aug"
</dest>
<voice>
- *: none
- rtc: "August"
+ *: "August"
</voice>
</phrase>
<phrase>
@@ -4356,16 +4323,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Sep"
+ *: "Sep"
</source>
<dest>
- *: none
- rtc: "Sep"
+ *: "Sep"
</dest>
<voice>
- *: none
- rtc: "September"
+ *: "September"
</voice>
</phrase>
<phrase>
@@ -4373,16 +4337,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Oct"
+ *: "Oct"
</source>
<dest>
- *: none
- rtc: "Oct"
+ *: "Oct"
</dest>
<voice>
- *: none
- rtc: "October"
+ *: "October"
</voice>
</phrase>
<phrase>
@@ -4390,16 +4351,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Nov"
+ *: "Nov"
</source>
<dest>
- *: none
- rtc: "Nov"
+ *: "Nov"
</dest>
<voice>
- *: none
- rtc: "November"
+ *: "November"
</voice>
</phrase>
<phrase>
@@ -4407,16 +4365,13 @@
desc: Maximum 3-letter abbreviation for monthname
user: core
<source>
- *: none
- rtc: "Dec"
+ *: "Dec"
</source>
<dest>
- *: none
- rtc: "Dec"
+ *: "Dec"
</dest>
<voice>
- *: none
- rtc: "December"
+ *: "December"
</voice>
</phrase>
<phrase>
@@ -10198,16 +10153,13 @@
desc: spoken only, for wall clock announce
user: core
<source>
- *: none
- rtc: ""
+ *: ""
</source>
<dest>
- *: none
- rtc: ""
+ *: ""
</dest>
<voice>
- *: none
- rtc: "o'clock"
+ *: "o'clock"
</voice>
</phrase>
<phrase>
@@ -10215,16 +10167,13 @@
desc: spoken only, for wall clock announce
user: core
<source>
- *: none
- rtc: ""
+ *: ""
</source>
<dest>
- *: none
- rtc: ""
+ *: ""
</dest>
<voice>
- *: none
- rtc: "P M"
+ *: "P M"
</voice>
</phrase>
<phrase>
@@ -10232,16 +10181,13 @@
desc: spoken only, for wall clock announce
user: core
<source>
- *: none
- rtc: ""
+ *: ""
</source>
<dest>
- *: none
- rtc: ""
+ *: ""
</dest>
<voice>
- *: none
- rtc: "A M"
+ *: "A M"
</voice>
</phrase>
<phrase>
@@ -10249,16 +10195,13 @@
desc: spoken only, for wall clock announce
user: core
<source>
- *: none
- rtc: ""
+ *: ""
</source>
<dest>
- *: none
- rtc: ""
+ *: ""
</dest>
<voice>
- *: none
- rtc: "oh"
+ *: "oh"
</voice>
</phrase>
<phrase>
diff --git a/apps/settings.h b/apps/settings.h
index fc82c8b..b72eec6 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -480,9 +480,7 @@
int qs_items[QUICKSCREEN_ITEM_COUNT];
#endif
-#if CONFIG_RTC
int timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */
-#endif
#ifdef HAVE_DISK_STORAGE
int disk_spindown; /* time until disk spindown, in seconds (0=off) */
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 027ed6a..bc03672 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1003,11 +1003,9 @@
CHOICE_SETTING(F_THEMESETTING, battery_display, LANG_BATTERY_DISPLAY, 0,
"battery display", graphic_numeric, NULL, 2,
ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)),
-#if CONFIG_RTC
CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0,
"time format", "24hour,12hour", NULL, 2,
ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)),
-#endif
#endif /* HAVE_LCD_BITMAP */
OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL),
/* system */