From e09177250ccf67f7b03fc8b4a59403fb403de8d7 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Thu, 7 Mar 2013 21:13:09 +0800 Subject: [PATCH 01/12] locale --- LOCALE | 32 ++++++++++++++++++++++++++++++++ Makefile | 7 ++++--- base/util.jl | 3 ++- doc/Makefile | 6 +++--- doc/README.md | 6 +++--- doc/{helpdb.jl => helpdb_en.jl} | 0 6 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 LOCALE rename doc/{helpdb.jl => helpdb_en.jl} (100%) diff --git a/LOCALE b/LOCALE new file mode 100644 index 0000000000000..58e5f29d573cb --- /dev/null +++ b/LOCALE @@ -0,0 +1,32 @@ +# Uncomment to enable +# Comment to disable +# A for Available, U for Unavailable + +# "bn"" # Bengali U +# "ca" # Catalan U +# "cs" # Czech U +# "da" # Danish U +# "de" # German U + "en" # English A +# "es" # Spanish U +# "et" # Estonian U +# "fa" # Iranian U +# "fi" # Finnish U +# "fr" # French U +# "hr" # Croatian U +# "it" # Italian U +# "ja" # Japanese U +# "ko" # Korean U +# "lt" # Lithuanian U +# "lv" # Latvian U +# "ne" # Nepali U +# "nl" # Dutch U +# "pl" # Polish U +# "pt_BR" # Brazilian Portuguese U +# "ru" # Russian U +# "sl" # Slovenian U +# "sv" # Swedish U +# "tr" # Turkish U +# "uk_UA" # Ukrainian U +# "zh_CN" # Simplified Chinese A +# "zh_TW" # Traditional Chinese U \ No newline at end of file diff --git a/Makefile b/Makefile index 07b38dbdc8d30..7f6f85684bbdd 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ ifeq ($(USE_QUIET), 1) QUIET_MAKE = -s endif -debug release: | $(DIRS) $(BUILD)/share/julia/extras $(BUILD)/share/julia/base $(BUILD)/share/julia/test $(BUILD)/share/julia/doc $(BUILD)/share/julia/examples $(BUILD)/share/julia/ui +debug release: | $(DIRS) $(BUILD)/share/julia/extras $(BUILD)/share/julia/base $(BUILD)/share/julia/test $(BUILD)/share/julia/doc $(BUILD)/share/julia/examples $(BUILD)/share/julia/ui $(BUILD)/share/julia/help @$(MAKE) $(QUIET_MAKE) julia-$@ @export JL_PRIVATE_LIBDIR=$(JL_PRIVATE_LIBDIR) && \ $(MAKE) $(QUIET_MAKE) LD_LIBRARY_PATH=$(BUILD)/lib:$(LD_LIBRARY_PATH) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$@)" $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji @@ -29,11 +29,11 @@ julia-debug julia-release: @$(MAKE) $(QUIET_MAKE) -C ui $@ @ln -sf $(BUILD)/bin/$@-$(DEFAULT_REPL) julia -$(BUILD)/share/julia/helpdb.jl: doc/helpdb.jl | $(BUILD)/share/julia +$(BUILD)/share/julia/help/helpdb_en.jl: doc/helpdb_en.jl | $(BUILD)/share/julia/help/ @cp $< $@ # use sys.ji if it exists, otherwise run two stages -$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji: VERSION base/*.jl base/pkg/*.jl $(BUILD)/share/julia/helpdb.jl +$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji: VERSION base/*.jl base/pkg/*.jl $(BUILD)/share/julia/help/helpdb_en.jl @#echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > COMMIT $(QUIET_JULIA) cd base && \ (test -f $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji || $(JULIA_EXECUTABLE) -bf sysimg.jl) && $(JULIA_EXECUTABLE) -f sysimg.jl || echo "Note: this error is usually fixed by running 'make clean'. If the error persists, 'make cleanall' may help." @@ -81,6 +81,7 @@ ifeq ($(OS), WINNT) -cp $(JULIAHOME)/contrib/windows/* $(PREFIX) endif cp $(JULIAHOME)/VERSION $(PREFIX)/share/julia/VERSION + cp $(JULIAHOME)/LOCALE $(PREFIX)/share/julia/LOCALE echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > $(PREFIX)/share/julia/COMMIT dist: diff --git a/base/util.jl b/base/util.jl index a060883787583..397aef702e12d 100644 --- a/base/util.jl +++ b/base/util.jl @@ -219,7 +219,8 @@ function init_help() help_module_dict, help_function_dict if help_category_dict == nothing println("Loading help data...") - helpdb = evalfile("$JULIA_HOME/../share/julia/helpdb.jl") + HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/LOCALE") + helpdb = evalfile("$JULIA_HOME/../share/julia/help/helpdb_$(HELP_LOCALE).jl") help_category_list = {} help_category_dict = Dict() help_module_dict = Dict() diff --git a/doc/Makefile b/doc/Makefile index 3c82ec36ea381..ea687548a73d8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -24,7 +24,7 @@ WGET = $(abspath ../deps)/jldownload help: @echo "Please use \`make ' where is one of" - @echo " helpdb.jl to make the REPL help db" + @echo " helpdb_en.jl to make the REPL help db" @echo " html to make standalone HTML files" @echo " dirhtml to make HTML files named index.html in directories" @echo " singlehtml to make a single large HTML file" @@ -171,9 +171,9 @@ doctest: @echo "Testing of doctests in the sources finished, look at the " \ "results in $(BUILDDIR)/doctest/output.txt." -helpdb.jl: stdlib/*.rst sphinx/jlhelp.py sphinx/julia.py +helpdb_en.jl: stdlib/*.rst sphinx/jlhelp.py sphinx/julia.py $(SPHINXBUILD) -b jlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/jlhelp - mv $(BUILDDIR)/jlhelp/jlhelp.jl helpdb.jl + mv $(BUILDDIR)/jlhelp/jlhelp.jl helpdb_en.jl listpkg: $(JULIA) listpkg.jl diff --git a/doc/README.md b/doc/README.md index 9b2b9bafc5634..769822f32c715 100644 --- a/doc/README.md +++ b/doc/README.md @@ -18,7 +18,7 @@ On ubuntu, you'll need the following packages installed: Then run - $ make helpdb.jl + $ make helpdb_en.jl $ make html $ make latexpdf @@ -27,9 +27,9 @@ File layout ----------- conf.py Sphinx configuration - helpdb.jl REPL help database + helpdb_en.jl REPL help database sphinx/ Sphinx extensions and plugins - sphinx/jlhelp.py Sphinx plugin to build helpdb.jl + sphinx/jlhelp.py Sphinx plugin to build helpdb_en.jl stdlib/ Julia standard library documentation _themes/ Sphinx html themes diff --git a/doc/helpdb.jl b/doc/helpdb_en.jl similarity index 100% rename from doc/helpdb.jl rename to doc/helpdb_en.jl From 0e1b706304825fc28a01dd16a60246a0470f7759 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Thu, 7 Mar 2013 21:14:53 +0800 Subject: [PATCH 02/12] locale --- LOCALE | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/LOCALE b/LOCALE index 58e5f29d573cb..b2c7c2c2ee7e2 100644 --- a/LOCALE +++ b/LOCALE @@ -2,31 +2,31 @@ # Comment to disable # A for Available, U for Unavailable -# "bn"" # Bengali U -# "ca" # Catalan U -# "cs" # Czech U -# "da" # Danish U -# "de" # German U - "en" # English A -# "es" # Spanish U -# "et" # Estonian U -# "fa" # Iranian U -# "fi" # Finnish U -# "fr" # French U -# "hr" # Croatian U -# "it" # Italian U -# "ja" # Japanese U -# "ko" # Korean U -# "lt" # Lithuanian U -# "lv" # Latvian U -# "ne" # Nepali U -# "nl" # Dutch U -# "pl" # Polish U -# "pt_BR" # Brazilian Portuguese U -# "ru" # Russian U -# "sl" # Slovenian U -# "sv" # Swedish U -# "tr" # Turkish U -# "uk_UA" # Ukrainian U -# "zh_CN" # Simplified Chinese A -# "zh_TW" # Traditional Chinese U \ No newline at end of file +# "bn" Bengali U +# "ca" Catalan U +# "cs" Czech U +# "da" Danish U +# "de" German U + "en" English A +# "es" Spanish U +# "et" Estonian U +# "fa" Iranian U +# "fi" Finnish U +# "fr" French U +# "hr" Croatian U +# "it" Italian U +# "ja" Japanese U +# "ko" Korean U +# "lt" Lithuanian U +# "lv" Latvian U +# "ne" Nepali U +# "nl" Dutch U +# "pl" Polish U +# "pt_BR" Brazilian Portuguese U +# "ru" Russian U +# "sl" Slovenian U +# "sv" Swedish U +# "tr" Turkish U +# "uk_UA" Ukrainian U +# "zh_CN" Simplified Chinese A +# "zh_TW" Traditional Chinese U \ No newline at end of file From 3e4cc4bce85f8616eae262630ffe25aa2b61cb5d Mon Sep 17 00:00:00 2001 From: wlbksy Date: Thu, 7 Mar 2013 21:28:19 +0800 Subject: [PATCH 03/12] locale --- base/util.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/util.jl b/base/util.jl index 397aef702e12d..1474bca3d27a3 100644 --- a/base/util.jl +++ b/base/util.jl @@ -219,7 +219,7 @@ function init_help() help_module_dict, help_function_dict if help_category_dict == nothing println("Loading help data...") - HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/LOCALE") + HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/LOCALE") helpdb = evalfile("$JULIA_HOME/../share/julia/help/helpdb_$(HELP_LOCALE).jl") help_category_list = {} help_category_dict = Dict() From e7a1a7d56414a66d092c8b6b31e7b18ac1f87876 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Thu, 7 Mar 2013 21:30:26 +0800 Subject: [PATCH 04/12] locale --- LOCALE | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/LOCALE b/LOCALE index b2c7c2c2ee7e2..76e7e8b4d6d54 100644 --- a/LOCALE +++ b/LOCALE @@ -2,31 +2,31 @@ # Comment to disable # A for Available, U for Unavailable -# "bn" Bengali U -# "ca" Catalan U -# "cs" Czech U -# "da" Danish U -# "de" German U - "en" English A -# "es" Spanish U -# "et" Estonian U -# "fa" Iranian U -# "fi" Finnish U -# "fr" French U -# "hr" Croatian U -# "it" Italian U -# "ja" Japanese U -# "ko" Korean U -# "lt" Lithuanian U -# "lv" Latvian U -# "ne" Nepali U -# "nl" Dutch U -# "pl" Polish U -# "pt_BR" Brazilian Portuguese U -# "ru" Russian U -# "sl" Slovenian U -# "sv" Swedish U -# "tr" Turkish U -# "uk_UA" Ukrainian U -# "zh_CN" Simplified Chinese A -# "zh_TW" Traditional Chinese U \ No newline at end of file +# "bn" # Bengali U +# "ca" # Catalan U +# "cs" # Czech U +# "da" # Danish U +# "de" # German U + "en" # English A +# "es" # Spanish U +# "et" # Estonian U +# "fa" # Iranian U +# "fi" # Finnish U +# "fr" # French U +# "hr" # Croatian U +# "it" # Italian U +# "ja" # Japanese U +# "ko" # Korean U +# "lt" # Lithuanian U +# "lv" # Latvian U +# "ne" # Nepali U +# "nl" # Dutch U +# "pl" # Polish U +# "pt_BR" # Brazilian Portuguese U +# "ru" # Russian U +# "sl" # Slovenian U +# "sv" # Swedish U +# "tr" # Turkish U +# "uk_UA" # Ukrainian U +# "zh_CN" # Simplified Chinese A +# "zh_TW" # Traditional Chinese U \ No newline at end of file From cbc6186259a7ba2441bcc7ba2ab7c741cac85d82 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Thu, 7 Mar 2013 21:47:39 +0800 Subject: [PATCH 05/12] locale --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f6f85684bbdd..6dc3ea8f588da 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ default: release DIRS = $(BUILD)/bin $(BUILD)/lib $(BUILD)/$(JL_PRIVATE_LIBDIR) $(BUILD)/share/julia $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir)))) -$(foreach link,extras base test doc examples ui,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia))) +$(foreach link,extras base test doc examples ui help,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia))) QUIET_MAKE = ifeq ($(USE_QUIET), 1) From c90ef566e76df443ff3242628b9664f05bc271f2 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Thu, 7 Mar 2013 22:52:40 +0800 Subject: [PATCH 06/12] locale should at bottom line --- LOCALE | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/LOCALE b/LOCALE index 76e7e8b4d6d54..83d07f77b6aba 100644 --- a/LOCALE +++ b/LOCALE @@ -1,32 +1,33 @@ -# Uncomment to enable -# Comment to disable +# Modify the last uncomment string into your specific locale string # A for Available, U for Unavailable # "bn" # Bengali U # "ca" # Catalan U -# "cs" # Czech U -# "da" # Danish U -# "de" # German U - "en" # English A +# "cs" # Czech U +# "da" # Danish U +# "de" # German U +# "en" # English A # "es" # Spanish U -# "et" # Estonian U +# "et" # Estonian U # "fa" # Iranian U # "fi" # Finnish U -# "fr" # French U -# "hr" # Croatian U +# "fr" # French U +# "hr" # Croatian U # "it" # Italian U -# "ja" # Japanese U -# "ko" # Korean U -# "lt" # Lithuanian U +# "ja" # Japanese U +# "ko" # Korean U +# "lt" # Lithuanian U # "lv" # Latvian U -# "ne" # Nepali U -# "nl" # Dutch U -# "pl" # Polish U -# "pt_BR" # Brazilian Portuguese U +# "ne" # Nepali U +# "nl" # Dutch U +# "pl" # Polish U +# "pt_BR" # Brazilian Portuguese U # "ru" # Russian U -# "sl" # Slovenian U +# "sl" # Slovenian U # "sv" # Swedish U # "tr" # Turkish U -# "uk_UA" # Ukrainian U -# "zh_CN" # Simplified Chinese A -# "zh_TW" # Traditional Chinese U \ No newline at end of file +# "uk_UA" # Ukrainian U +# "zh_CN" # Simplified Chinese A +# "zh_TW" # Traditional Chinese U + +"en" From b57208e3254ea89c887f7c845fead9b78e56c5c8 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Thu, 7 Mar 2013 23:11:16 +0800 Subject: [PATCH 07/12] rm trailing slash --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6dc3ea8f588da..c4c738052a6dc 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ julia-debug julia-release: @$(MAKE) $(QUIET_MAKE) -C ui $@ @ln -sf $(BUILD)/bin/$@-$(DEFAULT_REPL) julia -$(BUILD)/share/julia/help/helpdb_en.jl: doc/helpdb_en.jl | $(BUILD)/share/julia/help/ +$(BUILD)/share/julia/help/helpdb_en.jl: doc/helpdb_en.jl | $(BUILD)/share/julia/help @cp $< $@ # use sys.ji if it exists, otherwise run two stages From 3f200b273d7002f35018a5c041d6a19224155c77 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Fri, 8 Mar 2013 00:05:44 +0800 Subject: [PATCH 08/12] help dir --- Makefile | 1 - base/util.jl | 2 +- LOCALE => help/LOCALE | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename LOCALE => help/LOCALE (100%) diff --git a/Makefile b/Makefile index c4c738052a6dc..b5071824c6663 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,6 @@ ifeq ($(OS), WINNT) -cp $(JULIAHOME)/contrib/windows/* $(PREFIX) endif cp $(JULIAHOME)/VERSION $(PREFIX)/share/julia/VERSION - cp $(JULIAHOME)/LOCALE $(PREFIX)/share/julia/LOCALE echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > $(PREFIX)/share/julia/COMMIT dist: diff --git a/base/util.jl b/base/util.jl index 1474bca3d27a3..c854e51ffb260 100644 --- a/base/util.jl +++ b/base/util.jl @@ -219,7 +219,7 @@ function init_help() help_module_dict, help_function_dict if help_category_dict == nothing println("Loading help data...") - HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/LOCALE") + HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/help/LOCALE") helpdb = evalfile("$JULIA_HOME/../share/julia/help/helpdb_$(HELP_LOCALE).jl") help_category_list = {} help_category_dict = Dict() diff --git a/LOCALE b/help/LOCALE similarity index 100% rename from LOCALE rename to help/LOCALE From 1bdf49ebdc67e0b45653aaa053b465c02338167f Mon Sep 17 00:00:00 2001 From: wlbksy Date: Fri, 8 Mar 2013 00:30:37 +0800 Subject: [PATCH 09/12] last try --- help/LOCALE => LOCALE | 0 Makefile | 3 +++ base/util.jl | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) rename help/LOCALE => LOCALE (100%) diff --git a/help/LOCALE b/LOCALE similarity index 100% rename from help/LOCALE rename to LOCALE diff --git a/Makefile b/Makefile index b5071824c6663..9591c954bbbee 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ default: release DIRS = $(BUILD)/bin $(BUILD)/lib $(BUILD)/$(JL_PRIVATE_LIBDIR) $(BUILD)/share/julia +mkdir -p $(BUILD)/share/julia/help + $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir)))) $(foreach link,extras base test doc examples ui help,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia))) @@ -81,6 +83,7 @@ ifeq ($(OS), WINNT) -cp $(JULIAHOME)/contrib/windows/* $(PREFIX) endif cp $(JULIAHOME)/VERSION $(PREFIX)/share/julia/VERSION + cp $(JULIAHOME)/LOCALE $(PREFIX)/share/julia/LOCALE echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > $(PREFIX)/share/julia/COMMIT dist: diff --git a/base/util.jl b/base/util.jl index c854e51ffb260..1474bca3d27a3 100644 --- a/base/util.jl +++ b/base/util.jl @@ -219,7 +219,7 @@ function init_help() help_module_dict, help_function_dict if help_category_dict == nothing println("Loading help data...") - HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/help/LOCALE") + HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/LOCALE") helpdb = evalfile("$JULIA_HOME/../share/julia/help/helpdb_$(HELP_LOCALE).jl") help_category_list = {} help_category_dict = Dict() From d59b7373dd09b08669702f058eeaddc0ffa3b711 Mon Sep 17 00:00:00 2001 From: wlbksy Date: Fri, 8 Mar 2013 00:50:45 +0800 Subject: [PATCH 10/12] done --- help/LOCALE | 65 ++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/help/LOCALE b/help/LOCALE index 83d07f77b6aba..63bedeb5a43ea 100644 --- a/help/LOCALE +++ b/help/LOCALE @@ -1,33 +1,36 @@ -# Modify the last uncomment string into your specific locale string -# A for Available, U for Unavailable - -# "bn" # Bengali U -# "ca" # Catalan U -# "cs" # Czech U -# "da" # Danish U -# "de" # German U -# "en" # English A -# "es" # Spanish U -# "et" # Estonian U -# "fa" # Iranian U -# "fi" # Finnish U -# "fr" # French U -# "hr" # Croatian U -# "it" # Italian U -# "ja" # Japanese U -# "ko" # Korean U -# "lt" # Lithuanian U -# "lv" # Latvian U -# "ne" # Nepali U -# "nl" # Dutch U -# "pl" # Polish U -# "pt_BR" # Brazilian Portuguese U -# "ru" # Russian U -# "sl" # Slovenian U -# "sv" # Swedish U -# "tr" # Turkish U -# "uk_UA" # Ukrainian U -# "zh_CN" # Simplified Chinese A -# "zh_TW" # Traditional Chinese U +#==================================================# +# Modify the last uncomment string at the end of # +# this file into your specific locale string. # +# # +# A for Available, U for Unavailable. # +#==================================================# +# "bn" Bengali U +# "ca" Catalan U +# "cs" Czech U +# "da" Danish U +# "de" German U +# "en" English A +# "es" Spanish U +# "et" Estonian U +# "fa" Iranian U +# "fi" Finnish U +# "fr" French U +# "hr" Croatian U +# "it" Italian U +# "ja" Japanese U +# "ko" Korean U +# "lt" Lithuanian U +# "lv" Latvian U +# "ne" Nepali U +# "nl" Dutch U +# "pl" Polish U +# "pt_BR" Brazilian Portuguese U +# "ru" Russian U +# "sl" Slovenian U +# "sv" Swedish U +# "tr" Turkish U +# "uk_UA" Ukrainian U +# "zh_CN" Simplified Chinese A +# "zh_TW" Traditional Chinese U "en" From f71db8b6e0bc92a88bb475d10ef96ef9c73a069e Mon Sep 17 00:00:00 2001 From: wlbksy Date: Fri, 8 Mar 2013 00:54:11 +0800 Subject: [PATCH 11/12] done --- LOCALE | 36 ------------------------------------ Makefile | 3 --- base/util.jl | 2 +- 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 LOCALE diff --git a/LOCALE b/LOCALE deleted file mode 100644 index 63bedeb5a43ea..0000000000000 --- a/LOCALE +++ /dev/null @@ -1,36 +0,0 @@ -#==================================================# -# Modify the last uncomment string at the end of # -# this file into your specific locale string. # -# # -# A for Available, U for Unavailable. # -#==================================================# -# "bn" Bengali U -# "ca" Catalan U -# "cs" Czech U -# "da" Danish U -# "de" German U -# "en" English A -# "es" Spanish U -# "et" Estonian U -# "fa" Iranian U -# "fi" Finnish U -# "fr" French U -# "hr" Croatian U -# "it" Italian U -# "ja" Japanese U -# "ko" Korean U -# "lt" Lithuanian U -# "lv" Latvian U -# "ne" Nepali U -# "nl" Dutch U -# "pl" Polish U -# "pt_BR" Brazilian Portuguese U -# "ru" Russian U -# "sl" Slovenian U -# "sv" Swedish U -# "tr" Turkish U -# "uk_UA" Ukrainian U -# "zh_CN" Simplified Chinese A -# "zh_TW" Traditional Chinese U - -"en" diff --git a/Makefile b/Makefile index 9591c954bbbee..b5071824c6663 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,6 @@ default: release DIRS = $(BUILD)/bin $(BUILD)/lib $(BUILD)/$(JL_PRIVATE_LIBDIR) $(BUILD)/share/julia -mkdir -p $(BUILD)/share/julia/help - $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir)))) $(foreach link,extras base test doc examples ui help,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia))) @@ -83,7 +81,6 @@ ifeq ($(OS), WINNT) -cp $(JULIAHOME)/contrib/windows/* $(PREFIX) endif cp $(JULIAHOME)/VERSION $(PREFIX)/share/julia/VERSION - cp $(JULIAHOME)/LOCALE $(PREFIX)/share/julia/LOCALE echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > $(PREFIX)/share/julia/COMMIT dist: diff --git a/base/util.jl b/base/util.jl index 1474bca3d27a3..c854e51ffb260 100644 --- a/base/util.jl +++ b/base/util.jl @@ -219,7 +219,7 @@ function init_help() help_module_dict, help_function_dict if help_category_dict == nothing println("Loading help data...") - HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/LOCALE") + HELP_LOCALE = evalfile("$JULIA_HOME/../share/julia/help/LOCALE") helpdb = evalfile("$JULIA_HOME/../share/julia/help/helpdb_$(HELP_LOCALE).jl") help_category_list = {} help_category_dict = Dict() From 2a9ca96a9e9357870c1dce5b3652728f8118d69e Mon Sep 17 00:00:00 2001 From: wlbksy Date: Fri, 8 Mar 2013 00:54:29 +0800 Subject: [PATCH 12/12] done --- help/LOCALE | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 help/LOCALE diff --git a/help/LOCALE b/help/LOCALE new file mode 100644 index 0000000000000..63bedeb5a43ea --- /dev/null +++ b/help/LOCALE @@ -0,0 +1,36 @@ +#==================================================# +# Modify the last uncomment string at the end of # +# this file into your specific locale string. # +# # +# A for Available, U for Unavailable. # +#==================================================# +# "bn" Bengali U +# "ca" Catalan U +# "cs" Czech U +# "da" Danish U +# "de" German U +# "en" English A +# "es" Spanish U +# "et" Estonian U +# "fa" Iranian U +# "fi" Finnish U +# "fr" French U +# "hr" Croatian U +# "it" Italian U +# "ja" Japanese U +# "ko" Korean U +# "lt" Lithuanian U +# "lv" Latvian U +# "ne" Nepali U +# "nl" Dutch U +# "pl" Polish U +# "pt_BR" Brazilian Portuguese U +# "ru" Russian U +# "sl" Slovenian U +# "sv" Swedish U +# "tr" Turkish U +# "uk_UA" Ukrainian U +# "zh_CN" Simplified Chinese A +# "zh_TW" Traditional Chinese U + +"en"