Ticket #561: sl_561.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

@@ -166 +166 @@
         add_button.set_image(add_icon)
         add_button.connect('clicked',
                             self.__add_button_clicked_cb)
+        add_button.set_sensitive(False)
 
         remove_icon =  Icon(icon_name='list-remove')
         remove_button = gtk.Button()
@@ -197 +198 @@
 
     def _check_change(self):
         selected_langs = self._get_selected_langs()
+
+        # 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
+
+        last_lang = selected_langs[-1]
+
+        add_remove_box = self._add_remove_boxes[-1]
+        buttons = add_remove_box.get_children()
+        add_button = buttons[0] #XXX: Does this always work ?
+        if last_lang.startswith('en'):
+            add_button.set_sensitive(False)
+        else:
+            add_button.set_sensitive(True)
+            
+
         self._changed = (selected_langs != self._selected_locales)
 
         if self._changed == False: