diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-21 08:54:14 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-21 17:22:45 +0000 |
| commit | a5df94beb5cd7fd87828b9532b4a1a4da13ef774 (patch) | |
| tree | 6b36c2e23f576ee104331d2de3b58ad39a77ba40 /apps | |
| parent | 688c89cfe13658dc0c36c67235ed968e286d78bf (diff) | |
| download | rockbox-a5df94beb5cd7fd87828b9532b4a1a4da13ef774.tar.gz rockbox-a5df94beb5cd7fd87828b9532b4a1a4da13ef774.tar.bz2 rockbox-a5df94beb5cd7fd87828b9532b4a1a4da13ef774.zip | |
build: Tweaks to better support non-English as primary language
* get rid of $(LANGUAGE) in top-level makefile (and configure script)
* un-hardcode English-as-primary-language in a couple more places
* allow DEFAULT_VOICE_LANG to be overriden
To actually change the primary from English, one must change:
* $english in voice.pl
* hardcoded 'english' in rbutil
* $ENGLISH in apps/lang/lang.make
* DEFAULT_VOICE_LANG in apps/talk.c
* configure script (default prompt)
Of course, if one wants to change the default UI language, it's simpler
to change the default language setting variable at compile time, or
perhaps by adding a configuration file with the desired value into the
.rockbox directory when the .zip is assembled.
Change-Id: If5cf76019d416e838628a2eccd4ec7d6cbaeeb74
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/lang/lang.make | 7 | ||||
| -rw-r--r-- | apps/talk.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/lang/lang.make b/apps/lang/lang.make index 08cec5090a..c5db820326 100644 --- a/apps/lang/lang.make +++ b/apps/lang/lang.make @@ -11,6 +11,7 @@ LANGS := $(call preprocess, $(APPSDIR)/lang/SOURCES) LANGOBJ := $(LANGS:$(ROOTDIR)/%.lang=$(BUILDDIR)/%.lng) VOICEOBJ := $(LANGS:$(ROOTDIR)/%.lang=$(BUILDDIR)/%.vstrings) LANG_O = $(BUILDDIR)/lang/lang_core.o +ENGLISH := english CLEANOBJS += $(BUILDDIR)/lang/max_language_size.h $(BUILDDIR)/lang/lang* @@ -36,7 +37,7 @@ $(BUILDDIR)/lang/lang_core.o: $(BUILDDIR)/lang/lang.h $(BUILDDIR)/lang/lang_core # instead we pretend that genlang create lang_core.c and that lang.c depends from lang.h # it will work fine as long as one never manually removes lang.c and not lang.h, and it will avoid # race conditions such as running genlang twice or worse in parallel with other things! -$(BUILDDIR)/lang/lang.h: $(APPSDIR)/lang/$(LANGUAGE).lang $(BUILDDIR)/apps/features +$(BUILDDIR)/lang/lang.h: $(APPSDIR)/lang/$(ENGLISH).lang $(BUILDDIR)/apps/features $(call PRINTS,GEN lang.h) $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $< @@ -49,8 +50,8 @@ $(BUILDDIR)/lang_enum.h: $(BUILDDIR)/lang/lang.h $(BUILDDIR)/%.lng $(BUILDDIR)/%.vstrings: $(ROOTDIR)/%.lang $(BUILDDIR)/apps/genlang-features $(call PRINTS,GENLANG $(subst $(ROOTDIR)/,,$<)) $(SILENT)mkdir -p $(dir $@) - $(SILENT)$(TOOLSDIR)/genlang -u -e=$(APPSDIR)/lang/english.lang $< > $@.tmp - $(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/english.lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` -i=$(TARGET_ID) -b=$*.lng -c=$*.vstrings $@.tmp + $(SILENT)$(TOOLSDIR)/genlang -u -e=$(APPSDIR)/lang/$(ENGLISH).lang $< > $@.tmp + $(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/$(ENGLISH).lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` -i=$(TARGET_ID) -b=$*.lng -c=$*.vstrings $@.tmp $(SILENT)rm -f $@.tmp $(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ) diff --git a/apps/talk.c b/apps/talk.c index d38432de7c..3c532d964c 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -82,7 +82,9 @@ const char* const file_thumbnail_ext = ".talk"; #define LOADED_MASK 0x80000000 /* MSB */ +#ifndef DEFAULT_VOICE_LANG #define DEFAULT_VOICE_LANG "english" +#endif /***************** Data types *****************/ |