Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-ruby-bindings -> sle12 ## BNC# 877687 : "SLED/SLES12_LOC : ALL_LANGS:the dialog Untranslated text in 'Samba Server' screen" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-05-15 16:08:44.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-05-30 10:30:25.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 29 15:03:23 UTC 2014 - jreidinger@suse.com + +- fix translation if mixture of textdomain are used in included + files (bnc#877687) +- 3.1.18 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-ruby-bindings - at least 77 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings (Old) and /mounts/work_src_done/SLE12/yast2-ruby-bindings (BS:build ID:38731 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ruby-bindings", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-ruby-bindings-3.1.17.tar.bz2 New: ---- yast2-ruby-bindings-3.1.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ruby-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Mu2SCM/_old 2014-05-30 12:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Mu2SCM/_new 2014-05-30 12:20:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 ++++++ yast2-ruby-bindings-3.1.17.tar.bz2 -> yast2-ruby-bindings-3.1.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.17/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.1.18/package/yast2-ruby-bindings.changes --- old/yast2-ruby-bindings-3.1.17/package/yast2-ruby-bindings.changes 2014-05-15 12:36:30.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.18/package/yast2-ruby-bindings.changes 2014-05-30 10:25:25.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 29 15:03:23 UTC 2014 - jreidinger@suse.com + +- fix translation if mixture of textdomain are used in included + files (bnc#877687) +- 3.1.18 + +------------------------------------------------------------------- Wed May 14 13:13:09 UTC 2014 - mvidner@suse.com - Mechanically converted the remaining test/unit tests to RSpec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.17/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.1.18/package/yast2-ruby-bindings.spec --- old/yast2-ruby-bindings-3.1.17/package/yast2-ruby-bindings.spec 2014-05-15 12:36:30.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.18/package/yast2-ruby-bindings.spec 2014-05-30 10:25:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.17/src/ruby/yast/i18n.rb new/yast2-ruby-bindings-3.1.18/src/ruby/yast/i18n.rb --- old/yast2-ruby-bindings-3.1.17/src/ruby/yast/i18n.rb 2014-05-15 12:36:30.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.18/src/ruby/yast/i18n.rb 2014-05-30 10:25:26.000000000 +0200 @@ -18,7 +18,9 @@ # FastGettext does not track which file/class uses which text domain, # it has just single global text domain (the current one), # remember the requested text domain here - @my_textdomain = domain + # One object can have multiple text domains via multiple Yast.include (bnc#877687). + @my_textdomain ||= [] + @my_textdomain << domain unless @my_textdomain.include? domain # initialize available locales at first use or when the current language is changed if FastGettext.available_locales.nil? || current_language != FastGettext.locale @@ -42,7 +44,15 @@ return str unless @my_textdomain old_text_domain = FastGettext.text_domain - FastGettext.text_domain = @my_textdomain + # Switching textdomain clears gettext caches so avoid it if possible. + if !@my_textdomain.include?(old_text_domain) || + !FastGettext.key_exist?(str) + # Set domain where key is defined. + @my_textdomain.each do |domain| + FastGettext.text_domain = domain + break if FastGettext.key_exist?(str) + end + end FastGettext::Translation::_ str ensure FastGettext.text_domain = old_text_domain continue with "q"... Checked in at Fri May 30 12:20:38 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org