null+****@clear*****
null+****@clear*****
2011年 5月 17日 (火) 19:58:58 JST
Kouhei Sutou 2011-05-17 10:58:58 +0000 (Tue, 17 May 2011)
New Revision: 2264f56a17816de8cfd8256083800e6499b41e40
Log:
[doc] locale -> language.
Modified files:
build/makefiles/sphinx-build.mk
build/makefiles/sphinx.mk
doc/Makefile.am
Modified: build/makefiles/sphinx-build.mk (+1 -1)
===================================================================
--- build/makefiles/sphinx-build.mk 2011-05-17 10:52:46 +0000 (04aee1b)
+++ build/makefiles/sphinx-build.mk 2011-05-17 10:58:58 +0000 (e409c5c)
@@ -1,4 +1,4 @@
-DOC_LANGUAGES = en ja
+LOCALES = en ja
# You can set these variables from the command line.
DOCTREES_BASE = doctrees
Modified: build/makefiles/sphinx.mk (+14 -14)
===================================================================
--- build/makefiles/sphinx.mk 2011-05-17 10:52:46 +0000 (fcedc15)
+++ build/makefiles/sphinx.mk 2011-05-17 10:58:58 +0000 (2a717a9)
@@ -42,7 +42,7 @@ man: sphinx-ensure-updated man/groonga.1
man/groonga.1: $(source_files)
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/man \
-b man \
$(ALLSPHINXOPTS) \
@@ -52,7 +52,7 @@ html: sphinx-ensure-updated html/index.html
html/index.html: $(source_files)
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)html \
-b html \
$(ALLSPHINXOPTS) \
@@ -62,7 +62,7 @@ dirhtml: sphinx-ensure-updated dirhtml/index.html
dirhtml/index.html: $(source_files)
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/dirhtml \
-b dirhtml \
$(ALLSPHINXOPTS) \
@@ -72,7 +72,7 @@ pickle: sphinx-ensure-updated pickle/index.fpickle
pickle/index.fpickle: $(source_files)
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/pickle \
-b pickle \
$(ALLSPHINXOPTS) \
@@ -82,7 +82,7 @@ json: sphinx-ensure-updated json/index.fjson
json/index.fjson: $(source_files)
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/json \
-b json \
$(ALLSPHINXOPTS) \
@@ -92,7 +92,7 @@ htmlhelp: sphinx-ensure-updated htmlhelp/index.html
htmlhelp/index.html: $(source_files)
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/htmlhelp \
-b htmlhelp \
$(ALLSPHINXOPTS) \
@@ -100,7 +100,7 @@ htmlhelp/index.html: $(source_files)
qthelp: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/qthelp \
-b qthelp \
$(ALLSPHINXOPTS) \
@@ -114,7 +114,7 @@ qthelp: sphinx-ensure-updated
latex: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/latex \
-b latex \
$(ALLSPHINXOPTS) \
@@ -126,7 +126,7 @@ latex: sphinx-ensure-updated
rdoc: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/rdoc \
-b rdoc \
$(ALLSPHINXOPTS) \
@@ -134,7 +134,7 @@ rdoc: sphinx-ensure-updated
textile: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/textile \
-b textile \
$(ALLSPHINXOPTS) \
@@ -142,7 +142,7 @@ textile: sphinx-ensure-updated
changes: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/changes \
-b changes \
$(ALLSPHINXOPTS) \
@@ -152,7 +152,7 @@ linkcheck: sphinx-ensure-updated linkcheck/output.txt
linkcheck/output.txt: $(source_files)
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/linkcheck \
-b linkcheck \
$(ALLSPHINXOPTS) \
@@ -160,7 +160,7 @@ linkcheck/output.txt: $(source_files)
doctest: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/doctest \
-b doctest \
$(ALLSPHINXOPTS) \
@@ -168,7 +168,7 @@ doctest: sphinx-ensure-updated
pdf: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
- -Dlanguage=$(DOC_LANGUAGE) \
+ -Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/pdf \
-b pdf \
$(ALLSPHINXOPTS) \
Modified: doc/Makefile.am (+15 -15)
===================================================================
--- doc/Makefile.am 2011-05-17 10:52:46 +0000 (fe95e47)
+++ doc/Makefile.am 2011-05-17 10:58:58 +0000 (48b731d)
@@ -10,25 +10,25 @@ update-examples:
gettext: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) -b gettext $(ALLSPHINXOPTS) pot
-add-language: gettext
- test -n "$(LANGUAGE)" || \
- (echo "run with LANGUAGE=\$${NEW_LANGUAGE}."; \
- echo "e.g.: make add-language LANGUAGE=ja"; \
+add-locale: gettext
+ test -n "$(LOCALE)" || \
+ (echo "run with LOCALE=\$${NEW_LOCALE}."; \
+ echo "e.g.: make add-locale LOCALE=ja"; \
false)
- mkdir -p $(srcdir)/locale/$(LANGUAGE)/LC_MESSAGE
+ mkdir -p $(srcdir)/locale/$(LOCALE)/LC_MESSAGE
for pot in pot/*.pot; do \
po=`basename $$pot | sed s/pot$$/po/`; \
msginit \
--input "$$pot" \
- --output $(srcdir)/locale/$(LANGUAGE)/LC_MESSAGE/$${po} \
- --locale=$(LANGUAGE); \
+ --output $(srcdir)/locale/$(LOCALE)/LC_MESSAGE/$${po} \
+ --locale=$(LOCALE); \
done
update-po: gettext
- for language in $(LANGUAGES); do \
- test $${language} = "en" && continue; \
- for po in $(srcdir)/locale/$${language}/LC_MESSAGES/*.po; do \
- pot=$(BUILDDIR)/pot/`basename $$po | sed s/po$$/pot/`; \
+ for locale in $(LOCALES); do \
+ test $${locale} = "en" && continue; \
+ for po in $(srcdir)/locale/$${locale}/LC_MESSAGES/*.po; do \
+ pot=pot/`basename $$po | sed s/po$$/pot/`; \
echo -n "updateing $${po}: "; \
msgmerge \
--update \
@@ -39,11 +39,11 @@ update-po: gettext
done
create-mo:
- for language in $(LANGUAGES); do \
- test $${language} = "en" && continue; \
- for po in $(srcdir)/locale/$${language}/LC_MESSAGES/*.po; do \
+ for locale in $(LOCALES); do \
+ test $${locale} = "en" && continue; \
+ for po in $(srcdir)/locale/$${locale}/LC_MESSAGES/*.po; do \
mo=`basename $${po} | sed s/po$$/mo/`; \
- mo=locale/$${language}/LC_MESSAGES/$${mo}; \
+ mo=locale/$${locale}/LC_MESSAGES/$${mo}; \
echo "creating $${mo}"; \
mkdir -p `dirname $${mo}`; \
msgfmt -o $${mo} $${po}; \