ref: refs/heads/backgroud_patches_bnc550934
commit 41d3ce7c2cc573f364d003d7cc814336e7ee0c08
Author: Josef Reidinger
Date: Wed Nov 25 12:54:36 2009 +0100
fix using proper default locale if langauge is not yet set (bnc#557767) (test is not included as I cannot find lang_helper test_suite)
---
webclient/package/yast2-webclient.changes | 7 +++++++
webclient/package/yast2-webclient.spec | 2 +-
.../vendor/plugins/lang_helper/lib/lang_helper.rb | 8 +++++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes
index f41c7e0..f8b4ef8 100644
--- a/webclient/package/yast2-webclient.changes
+++ b/webclient/package/yast2-webclient.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Nov 25 11:52:19 UTC 2009 - jreidinger@novell.com
+
+- fix using default language if language is not yet set
+ (bnc#557767)
+- 0.0.23
+
+-------------------------------------------------------------------
Wed Nov 25 10:15:27 UTC 2009 - lslezak@suse.cz
- yastwc init script - print the URL where the service is running
diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec
index 77b18af..143eb58 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.22
+Version: 0.0.23
Release: 0
Summary: YaST2 - Webclient
Source: www.tar.bz2
diff --git a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb
index f9c466b..c4ad1a7 100644
--- a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb
+++ b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb
@@ -29,7 +29,13 @@ module LangHelper
end
def current_locale
- locale.language
+ ret = locale.language
+ 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}
+ Rails.logger.info ("returned locale #{ret}")
+ return ret
end
def language_name(code)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
