lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kconfig: fix update-po-config

Browse Source 
Massimo Maiurana <maiurana@gmail.com> reported that
update-po-config was broken:
1) spelling errors in Makefile so arch/um failed
2) UTF-8 was not supported

The following patch address the above problems.
kxgettext now append the output to the .pot file
generated by xgettext - so we have a header.
In all places UFT-8 is specifed so we now flawlessly
support UTF-8.
The Kconfig files had an empty string in a few cases -
these are now supressed in kxgettext.

With this the translators can now pick up where they left
and get it all translated.
There are ~11000 strings to be translated...

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc:  Massimo Maiurana <maiurana@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
This commit is contained in:
Sam Ravnborg
2007-06-10 20:38:27 +02:00
parent 4c6f2eb979
commit b70e325cfe
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/kconfig/Makefile
View File

@@ -22,24 +22,25 @@ oldconfig: $(obj)/conf
silentoldconfig: $(obj)/conf silentoldconfig: $(obj)/conf
$< -s arch/$(ARCH)/Kconfig $< -s arch/$(ARCH)/Kconfig
# Create new linux.po file
# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
# The symlink is used to repair a deficiency in arch/um
update-po-config: $(obj)/kxgettext update-po-config: $(obj)/kxgettext
xgettext --default-domain=linux \ xgettext --default-domain=linux \
--add-comments --keyword=_ --keyword=N_ \ --add-comments --keyword=_ --keyword=N_ \
--from-code=UTF-8 \
--files-from=scripts/kconfig/POTFILES.in \ --files-from=scripts/kconfig/POTFILES.in \
--output scripts/kconfig/config.pot --output $(obj)/config.pot
$(Q)ln -fs Kconfig_i386 arch/um/Kconfig_arch $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
$(Q)for i in `ls arch/`; \ $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
(for i in `ls arch/`; \
do \ do \
scripts/kconfig/kxgettext arch/$$i/Kconfig \ $(obj)/kxgettext arch/$$i/Kconfig; \
| msguniq -o scripts/kconfig/linux_$${i}.pot; \ done ) >> $(obj)/config.pot
done msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
$(Q)msgcat scripts/kconfig/config.pot \ --output $(obj)/linux.pot
`find scripts/kconfig/ -type f -name linux_*.pot` \ $(Q)rm -f arch/um/Kconfig.arch
--output scripts/kconfig/linux_raw.pot $(Q)rm -f $(obj)/config.pot
$(Q)msguniq --sort-by-file scripts/kconfig/linux_raw.pot \
--output scripts/kconfig/linux.pot
$(Q)rm -f arch/um/Kconfig_arch
$(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot
PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig

2
scripts/kconfig/kxgettext.c
View File

@@ -212,6 +212,8 @@ void menu__xgettext(void)
struct message *m = message__list; struct message *m = message__list;
while (m != NULL) { while (m != NULL) {
/* skip empty lines ("") */
if (strlen(m->msg) > sizeof("\"\""))
message__print_gettext_msgid_msgstr(m); message__print_gettext_msgid_msgstr(m);
m = m->next; m = m->next;
} }