ref: refs/heads/master
commit 04805979f0f7bd41e5fc28f8c3bcdd930d9a90dc
Author: Josef Reidinger
Date: Fri Nov 27 12:48:00 2009 +0100
support only language which has support in SLE11 (bnc#557768)
---
webclient/package/yast2-webclient.changes | 6 ++++++
webclient/package/yast2-webclient.spec | 2 +-
webclient/test/functional/lang_controller_test.rb | 12 +++++-------
.../vendor/plugins/lang_helper/lib/lang_helper.rb | 16 ++++++++++++++--
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes
index 5057b34..15487fe 100644
--- a/webclient/package/yast2-webclient.changes
+++ b/webclient/package/yast2-webclient.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Nov 27 11:44:25 UTC 2009 - jreidinger@novell.com
+
+- show only SLE11 supported languages (bnc#557768)
+- 0.0.26
+
+-------------------------------------------------------------------
Thu Nov 26 14:43:11 CET 2009 - schubi@suse.de
- removed *.swp file, added .*.swp to .gitignore
diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec
index b7bf97b..57ff506 100644
--- a/webclient/package/yast2-webclient.spec
+++ b/webclient/package/yast2-webclient.spec
@@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails
License: LGPL v2.1;ASLv2.0
Group: Productivity/Networking/Web/Utilities
Autoreqprov: on
-Version: 0.0.25
+Version: 0.0.26
Release: 0
Summary: YaST2 - Webclient
Source: www.tar.bz2
diff --git a/webclient/test/functional/lang_controller_test.rb b/webclient/test/functional/lang_controller_test.rb
index db20922..ef3dcf7 100644
--- a/webclient/test/functional/lang_controller_test.rb
+++ b/webclient/test/functional/lang_controller_test.rb
@@ -5,26 +5,24 @@ class LangController < ApplicationController
end
class LangControllerTest < ActionController::TestCase
- SUPPORTED_LANG = [ "en_US", "en_GB", "cs_CZ", "de_DE" ]
def setup
@controller = LangController.new
- I18n.supported_locales= SUPPORTED_LANG
end
def test_known_lang
- @controller.locale.stubs(:language).returns("cs_CZ")
- assert_equal "cs_CZ",@controller.current_locale
+ @controller.locale.stubs(:language).returns("es")
+ assert_equal "es",@controller.current_locale
end
def test_unsuported_lang
- @controller.locale.stubs(:language).returns("pt_BR")
+ @controller.locale.stubs(:language).returns("af") #af is not supported now
assert_equal "en_US",@controller.current_locale
end
def test_browser_lang
- @controller.locale.stubs(:language).returns("en-gb")
- assert_equal "en_GB",@controller.current_locale
+ @controller.locale.stubs(:language).returns("zh-cn")
+ assert_equal "zh_CN",@controller.current_locale
end
end
diff --git a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb
index c4ad1a7..09b2478 100644
--- a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb
+++ b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb
@@ -24,6 +24,7 @@ module LangHelper
'uk' => 'Українська', 'vi' => 'Tiếng Việt', 'wa' => 'Walon', 'xh' => 'isiXhosa',
'zh_CN' => '简体中文', 'zh_TW' => '繁體中文', 'zu' => 'isiZulu'}
+
def current_locale_image
return "/images/flags/#{locale.language}.png"
end
@@ -33,7 +34,7 @@ module LangHelper
Rails.logger.info ("detected locale #{ret}")
#find locale from existing one, translate if locale came from browser to current one, fallback to american english
default = lambda{return "en_US"} #detect require something which response to call
- ret = I18n.supported_locales.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil}
+ ret = supported_languages.detect(default) { |k| ret.tr('-','_').downcase == k.downcase ? k : nil}
Rails.logger.info ("returned locale #{ret}")
return ret
end
@@ -58,7 +59,7 @@ module LangHelper
end
def show_language
- langs = I18n.supported_locales.sort
+ langs = supported_languages.sort
ret = "<h4>" + _("Select locale") + "</h4>"
langs.each_with_index do |lang, i|
ret << link_to( language_name(lang),
@@ -74,5 +75,16 @@ module LangHelper
# flash[:notice] = _('Cookie "lang" is set: %s') % params["id"]
redirect_to :back
end
+
+ #do not use this constant (only internal), use supported_languages method
+ SUPPORTED_LANGUAGE= [
+ "ar","cs","de","es","en_US","fr","hu","it","ja","ko",
+ "nl","pl","pt_BR","ru","sv","zh_CN","zh_TW"
+ ]
+ def supported_languages
+ #TODO read from file if vendor want create own translations
+ #list is same as SLE11SP1 supported
+ return SUPPORTED_LANGUAGE
+ end
end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Josef Reidinger