Ticket #561: slo_561_2.patch

extensions/cpsection/language/model.py

@@ -74 +74 @@
         fd.close()
     else:
         fd = open(path, 'w')
-        fd.write('LANG="%s"\n' % langs[0])
+        fd.write('LANG="%s"\n' % langs[0].strip("\n"))
         fd.write('LANGUAGE="%s"\n' % langstr)
         fd.close()
 

extensions/cpsection/language/view.py

@@ -118 +118 @@
             previous_add_removes = self._add_remove_boxes[-2]
             previous_add_removes.hide_all()
 
+        self._determine_add_remove_visibility()
+
         combobox.show()
 
     def _attach_to_table(self, widget, row, column, padding=20, \
@@ -173 +175 @@
         remove_button.connect('clicked',
                             self.__remove_button_clicked_cb)
 
-        if self._selected_lang_count == 1:
-            remove_button.set_sensitive(False)
-
         add_remove_box = gtk.HButtonBox()
         add_remove_box.set_layout(gtk.BUTTONBOX_START)
         add_remove_box.set_spacing(10)
@@ -197 +196 @@
 
     def _check_change(self):
         selected_langs = self._get_selected_langs()
+        last_lang = selected_langs[-1]
+
+        self._determine_add_remove_visibility(last_lang = last_lang)
+            
         self._changed = (selected_langs != self._selected_locales)
 
         if self._changed == False:
@@ -226 +229 @@
         
         return new_codes
 
+    def _determine_add_remove_visibility(self, last_lang = None):
+        # We should not let users add fallback languages for English (Foo)
+        # This is because the software is not usually _translated_ into English
+        # which means that the fallback gets selected autmatically
+
+        if last_lang is None:
+            selected_langs = self._get_selected_langs()
+            last_lang = selected_langs[-1]
+            
+        add_remove_box = self._add_remove_boxes[-1]
+        buttons = add_remove_box.get_children()
+        add_button, remove_button = buttons
+        
+        if last_lang.startswith('en_US'):
+            add_button.props.visible = False
+        else:
+            add_button.props.visible = True
+
+        if self._selected_lang_count == 1:
+            remove_button.props.visible = False
+        else:
+            remove_button.props.visible = True
+
+
     def __lang_timeout_cb(self, codes):
         self._lang_sid = 0
         self._model.set_languages(codes)