devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix build on non-RTC targets.

Browse source 
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
This commit is contained in:
Solomon Peachy 2019-07-20 12:58:57 -04:00
parent 3665eecf47
commit d1b8b39f55
3 changed files with 57 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

171
apps/lang/english.lang
View file

@ -3980,16 +3980,13 @@
desc: select the time format of time in status bar desc: select the time format of time in status bar
user: core user: core
<source> <source>
*: none *: "Time Format"
rtc: "Time Format"
</source> </source>
<dest> <dest>
*: none *: "Time Format"
rtc: "Time Format"
</dest> </dest>
<voice> <voice>
*: none *: "Time Format"
rtc: "Time Format"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -3997,16 +3994,13 @@
desc: option for 12 hour clock desc: option for 12 hour clock
user: core user: core
<source> <source>
*: none *: "12 Hour Clock"
rtc: "12 Hour Clock"
</source> </source>
<dest> <dest>
*: none *: "12 Hour Clock"
rtc: "12 Hour Clock"
</dest> </dest>
<voice> <voice>
*: none *: "12 Hour Clock"
rtc: "12 Hour Clock"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4014,16 +4008,13 @@
desc: option for 24 hour clock desc: option for 24 hour clock
user: core user: core
<source> <source>
*: none *: "24 Hour Clock"
rtc: "24 Hour Clock"
</source> </source>
<dest> <dest>
*: none *: "24 Hour Clock"
rtc: "24 Hour Clock"
</dest> </dest>
<voice> <voice>
*: none *: "24 Hour Clock"
rtc: "24 Hour Clock"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4220,16 +4211,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Jan"
rtc: "Jan"
</source> </source>
<dest> <dest>
*: none *: "Jan"
rtc: "Jan"
</dest> </dest>
<voice> <voice>
*: none *: "January"
rtc: "January"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4237,16 +4225,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Feb"
rtc: "Feb"
</source> </source>
<dest> <dest>
*: none *: "Feb"
rtc: "Feb"
</dest> </dest>
<voice> <voice>
*: none *: "February"
rtc: "February"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4254,16 +4239,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Mar"
rtc: "Mar"
</source> </source>
<dest> <dest>
*: none *: "Mar"
rtc: "Mar"
</dest> </dest>
<voice> <voice>
*: none *: "March"
rtc: "March"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4271,16 +4253,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Apr"
rtc: "Apr"
</source> </source>
<dest> <dest>
*: none *: "Apr"
rtc: "Apr"
</dest> </dest>
<voice> <voice>
*: none *: "April"
rtc: "April"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4288,16 +4267,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "May"
rtc: "May"
</source> </source>
<dest> <dest>
*: none *: "May"
rtc: "May"
</dest> </dest>
<voice> <voice>
*: none *: "May"
rtc: "May"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4305,16 +4281,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Jun"
rtc: "Jun"
</source> </source>
<dest> <dest>
*: none *: "Jun"
rtc: "Jun"
</dest> </dest>
<voice> <voice>
*: none *: "June"
rtc: "June"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4322,16 +4295,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Jul"
rtc: "Jul"
</source> </source>
<dest> <dest>
*: none *: "Jul"
rtc: "Jul"
</dest> </dest>
<voice> <voice>
*: none *: "July"
rtc: "July"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4339,16 +4309,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Aug"
rtc: "Aug"
</source> </source>
<dest> <dest>
*: none *: "Aug"
rtc: "Aug"
</dest> </dest>
<voice> <voice>
*: none *: "August"
rtc: "August"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4356,16 +4323,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Sep"
rtc: "Sep"
</source> </source>
<dest> <dest>
*: none *: "Sep"
rtc: "Sep"
</dest> </dest>
<voice> <voice>
*: none *: "September"
rtc: "September"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4373,16 +4337,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Oct"
rtc: "Oct"
</source> </source>
<dest> <dest>
*: none *: "Oct"
rtc: "Oct"
</dest> </dest>
<voice> <voice>
*: none *: "October"
rtc: "October"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4390,16 +4351,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Nov"
rtc: "Nov"
</source> </source>
<dest> <dest>
*: none *: "Nov"
rtc: "Nov"
</dest> </dest>
<voice> <voice>
*: none *: "November"
rtc: "November"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -4407,16 +4365,13 @@
desc: Maximum 3-letter abbreviation for monthname desc: Maximum 3-letter abbreviation for monthname
user: core user: core
<source> <source>
*: none *: "Dec"
rtc: "Dec"
</source> </source>
<dest> <dest>
*: none *: "Dec"
rtc: "Dec"
</dest> </dest>
<voice> <voice>
*: none *: "December"
rtc: "December"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -10198,16 +10153,13 @@
desc: spoken only, for wall clock announce desc: spoken only, for wall clock announce
user: core user: core
<source> <source>
*: none *: ""
rtc: ""
</source> </source>
<dest> <dest>
*: none *: ""
rtc: ""
</dest> </dest>
<voice> <voice>
*: none *: "o'clock"
rtc: "o'clock"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -10215,16 +10167,13 @@
desc: spoken only, for wall clock announce desc: spoken only, for wall clock announce
user: core user: core
<source> <source>
*: none *: ""
rtc: ""
</source> </source>
<dest> <dest>
*: none *: ""
rtc: ""
</dest> </dest>
<voice> <voice>
*: none *: "P M"
rtc: "P M"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -10232,16 +10181,13 @@
desc: spoken only, for wall clock announce desc: spoken only, for wall clock announce
user: core user: core
<source> <source>
*: none *: ""
rtc: ""
</source> </source>
<dest> <dest>
*: none *: ""
rtc: ""
</dest> </dest>
<voice> <voice>
*: none *: "A M"
rtc: "A M"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -10249,16 +10195,13 @@
desc: spoken only, for wall clock announce desc: spoken only, for wall clock announce
user: core user: core
<source> <source>
*: none *: ""
rtc: ""
</source> </source>
<dest> <dest>
*: none *: ""
rtc: ""
</dest> </dest>
<voice> <voice>
*: none *: "oh"
rtc: "oh"
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>

2
apps/settings.h
View file

@ -480,9 +480,7 @@ struct user_settings
int qs_items[QUICKSCREEN_ITEM_COUNT]; int qs_items[QUICKSCREEN_ITEM_COUNT];
#endif #endif
#if CONFIG_RTC
int timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */ int timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */
#endif
#ifdef HAVE_DISK_STORAGE #ifdef HAVE_DISK_STORAGE
int disk_spindown; /* time until disk spindown, in seconds (0=off) */ int disk_spindown; /* time until disk spindown, in seconds (0=off) */

2
apps/settings_list.c
View file

@ -1003,11 +1003,9 @@ const struct settings_list settings[] = {
CHOICE_SETTING(F_THEMESETTING, battery_display, LANG_BATTERY_DISPLAY, 0, CHOICE_SETTING(F_THEMESETTING, battery_display, LANG_BATTERY_DISPLAY, 0,
"battery display", graphic_numeric, NULL, 2, "battery display", graphic_numeric, NULL, 2,
ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)), ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)),
#if CONFIG_RTC
CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0, CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0,
"time format", "24hour,12hour", NULL, 2, "time format", "24hour,12hour", NULL, 2,
ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)), ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)),
#endif
#endif /* HAVE_LCD_BITMAP */ #endif /* HAVE_LCD_BITMAP */
OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL),
/* system */ /* system */