Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2015-10-12 10:00:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2015-08-21 12:42:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2015-10-12 10:00:09.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 1 14:59:57 CEST 2015 - [email protected] + +- Allocate space for "Other Settings" button proportionally to its + translation length (bnc#946955) +- 3.1.24 + +------------------------------------------------------------------- Old: ---- yast2-country-3.1.23.tar.bz2 New: ---- yast2-country-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.GPUQd5/_old 2015-10-12 10:00:10.000000000 +0200 +++ /var/tmp/diff_new_pack.GPUQd5/_new 2015-10-12 10:00:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.1.23.tar.bz2 -> yast2-country-3.1.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.23/package/yast2-country.changes new/yast2-country-3.1.24/package/yast2-country.changes --- old/yast2-country-3.1.23/package/yast2-country.changes 2015-08-18 16:49:08.000000000 +0200 +++ new/yast2-country-3.1.24/package/yast2-country.changes 2015-10-01 16:14:15.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 1 14:59:57 CEST 2015 - [email protected] + +- Allocate space for "Other Settings" button proportionally to its + translation length (bnc#946955) +- 3.1.24 + +------------------------------------------------------------------- Tue Aug 18 14:18:52 UTC 2015 - [email protected] - Use xkb converted console keymaps (better systemd support) where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.23/package/yast2-country.spec new/yast2-country-3.1.24/package/yast2-country.spec --- old/yast2-country-3.1.23/package/yast2-country.spec 2015-08-18 16:49:08.000000000 +0200 +++ new/yast2-country-3.1.24/package/yast2-country.spec 2015-10-01 16:14:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.23/timezone/src/include/timezone/dialogs.rb new/yast2-country-3.1.24/timezone/src/include/timezone/dialogs.rb --- old/yast2-country-3.1.23/timezone/src/include/timezone/dialogs.rb 2015-08-18 16:49:08.000000000 +0200 +++ new/yast2-country-3.1.24/timezone/src/include/timezone/dialogs.rb 2015-10-01 16:14:15.000000000 +0200 @@ -531,15 +531,14 @@ Timezone.PushVal - - settime = Empty() + # TRANSLATORS: Button label + other_settings_label = _("Other &Settings...") # "On a mainframe it is impossible for the user to change the hardware clock. - # So you can only specify the timezone." (ihno) - if !Arch.s390 && !Mode.config - # button text - settime = PushButton(Id(:settime), _("Other &Settings...")) - end + # So you can only specify the timezone." (Ihno) + settime = ((!Arch.s390 && !Mode.config) ? + PushButton(Id(:settime), other_settings_label) : Empty() + ) textmode = Language.GetTextMode @@ -637,12 +636,19 @@ if UI.HasSpecialWidget(:TimezoneSelector) == true timezone_selector = true worldmap = Ops.add(Directory.themedir, "/current/worldmap/worldmap.jpg") + + # bsc#946955 Translation doesn't fit in some languages + # Reserved space needs to be allocated proportionally to the text length + other_settings_hweight = other_settings_label.size + free_space_hweight = 10 + entries_hweight = 25 + timezoneterm = VBox( TimezoneSelector(Id(:timezonemap), Opt(:notify), worldmap, zones), HBox( - HWeight(1, HStretch()), + HWeight(free_space_hweight, HStretch()), HWeight( - 2, + entries_hweight, ComboBox( Id(:region), Opt(:notify), @@ -653,25 +659,25 @@ ), HSpacing(), HWeight( - 2, + entries_hweight, ComboBox(Id(:timezone), Opt(:notify), _("Time &Zone")) ), HSpacing(), - HWeight(1, HStretch()) + HWeight(other_settings_hweight, HStretch()) ), HBox( - HWeight(1, HStretch()), - HWeight(2, Left( + HWeight(free_space_hweight, HStretch()), + HWeight(entries_hweight, Left( utc_only ? Label(" ") : hwclock_term )), HSpacing(), - HWeight(2, HBox( + HWeight(entries_hweight, HBox( Label(_("Date and Time:")), Label(Id(:date), date), HStretch() )), HSpacing(), - HWeight(1, Right(settime)) + HWeight(other_settings_hweight, Right(settime)) ) ) else
