diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2009-02-25 13:05:57 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2009-02-25 13:05:57 +0000 |
| commit | da4f71b1f1b3a2bfce8114472e08f84182472c7d (patch) | |
| tree | 427ddce7984079d598a1508d3ffbfbd4602030ce | |
| parent | b12da067cef7f82012b6568f256b5fa143ab9825 (diff) | |
| download | bootloader-theme-da4f71b1f1b3a2bfce8114472e08f84182472c7d.tar bootloader-theme-da4f71b1f1b3a2bfce8114472e08f84182472c7d.tar.gz bootloader-theme-da4f71b1f1b3a2bfce8114472e08f84182472c7d.tar.bz2 bootloader-theme-da4f71b1f1b3a2bfce8114472e08f84182472c7d.tar.xz bootloader-theme-da4f71b1f1b3a2bfce8114472e08f84182472c7d.zip | |
Rename 'languages' to 'lang'
The list of languages available to the gfxboot menu is stored in a file
which used to be called "languages". However, when using isolinux this
file can't be found because its name is too long (9 chars). Renaming it
to langs fixes that problem
| -rw-r--r-- | Makefile | 4 | ||||
| l--------- | data-boot/langs | 1 | ||||
| l--------- | data-boot/languages | 1 | ||||
| -rw-r--r-- | data-install/langs (renamed from data-install/languages) | 0 | ||||
| -rw-r--r-- | fonts/Makefile | 2 | ||||
| -rw-r--r-- | src/dia_lang.inc | 6 |
6 files changed, 7 insertions, 7 deletions
@@ -50,7 +50,7 @@ bootlogo: src/main.bin help-install/.ready po/.ready fonts/.ready ifdef DEFAULT_LANG @echo $(DEFAULT_LANG) >bootlogo.dir/lang endif - @sh -c 'cd bootlogo.dir; chmod +t * ; chmod -t init languages' + @sh -c 'cd bootlogo.dir; chmod +t * ; chmod -t init langs' @sh -c 'cd bootlogo.dir; echo $(IN_CPIO_INSTALL) | sed -e "s/ /\n/g" | cpio --quiet -o >../bootlogo' @cd bootlogo.dir; rm $(IN_CPIO_INSTALL) @@ -63,7 +63,7 @@ message: src/main.bin help-boot/.ready po/.ready fonts/.ready ifdef DEFAULT_LANG cp -rL po/$(DEFAULT_LANG).tr help-boot/$(DEFAULT_LANG).hlp message.dir @echo $(DEFAULT_LANG) >message.dir/lang - @echo $(DEFAULT_LANG) >>message.dir/languages + @echo $(DEFAULT_LANG) >>message.dir/langs endif @sh -c 'cd message.dir; echo * | sed -e "s/ /\n/g" | cpio --quiet -o >../message' @rm -r message.dir diff --git a/data-boot/langs b/data-boot/langs new file mode 120000 index 0000000..bad0911 --- /dev/null +++ b/data-boot/langs @@ -0,0 +1 @@ +../data-install/langs
\ No newline at end of file diff --git a/data-boot/languages b/data-boot/languages deleted file mode 120000 index ba8064b..0000000 --- a/data-boot/languages +++ /dev/null @@ -1 +0,0 @@ -../data-install/languages
\ No newline at end of file diff --git a/data-install/languages b/data-install/langs index 91f62ba..91f62ba 100644 --- a/data-install/languages +++ b/data-install/langs diff --git a/fonts/Makefile b/fonts/Makefile index c040d84..ce60b70 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -18,7 +18,7 @@ fonts: 16x16.fnt `$(KEYMAPCHARS) ../keymaps/keymap.*.inc` \ -t tmp.txt \ -t ../src/main.log \ - -t ../data-install/languages \ + -t ../data-install/langs \ -f NachlieliCLM-Bold:size=14:c=0x590-0x5ff \ -f KacstOne:size=14:c=0x600-0x6ff,0xfe70-0xfefc:dy=2 \ -f MuktiNarrow:size=18:c=0x0981-0x09fa:bold=1 \ diff --git a/src/dia_lang.inc b/src/dia_lang.inc index e846c00..07a70ac 100644 --- a/src/dia_lang.inc +++ b/src/dia_lang.inc @@ -9,7 +9,7 @@ % Some global vars. % -% fallback if there is no "languages" +% fallback if there is no "langs" /lang.items [ "en_US" ] def /lang.names [ "English (US)" ] def @@ -132,14 +132,14 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Parse "languages" file. +% Parse "langs" file. % % ( ) ==> ( ) % /lang.parsedata { /lang.default 0 def - "languages" findfile dup { /lang.data exch def } { pop return } ifelse + "langs" findfile dup { /lang.data exch def } { pop return } ifelse /la.tmp.datalen lang.data length def /la.tmp.str lang.data cvs def |