source:
unity-greeter/trunk/fuentes/debian/patches/llx-language-selector.patch
@
946
Last change on this file since 946 was 946, checked in by , 5 years ago | |
---|---|
File size: 4.9 KB |
-
po/ca@valencia.po
diff -uNar kk2/unity-greeter-16.04.2/po/ca@valencia.po kk/unity-mod/po/ca@valencia.po
old new 230 230 231 231 #~ msgid "_Back" 232 232 #~ msgstr "_Enrere" 233 234 msgid "Language selection" 235 msgstr "Selecció d'idioma" 236 237 msgid "User defined (Language Support)" 238 msgstr "Definit per l'usuari (Suport d'idioma)" 239 240 msgid "English" 241 msgstr "Anglés" 242 243 msgid "Spanish" 244 msgstr "Espanyol" 245 246 msgid "Valencian" 247 msgstr "Valencià" 248 -
po/es.po
diff -uNar kk2/unity-greeter-16.04.2/po/es.po kk/unity-mod/po/es.po
old new 243 243 244 244 #~ msgid "Favorite Color (blue):" 245 245 #~ msgstr "Color favorito (azul):" 246 247 msgid "Language selection" 248 msgstr "Selección de idioma" 249 250 msgid "User defined (Language Support)" 251 msgstr "Definido por el usuario (Soporte de idiomas)" 252 253 msgid "Spanish" 254 msgstr "Español" 255 256 msgid "Valencian" 257 msgstr "Valenciano" 258 259 msgid "English" 260 msgstr "Inglés" 261 -
src/menubar.vala
diff -uNar kk2/unity-greeter-16.04.2/src/menubar.vala kk/unity-mod/src/menubar.vala
old new 70 70 public Gtk.Window? keyboard_window { get; private set; default = null; } 71 71 public Gtk.AccelGroup? accel_group { get; construct; } 72 72 73 public string user_language{get; private set; default = "";} 74 73 75 private static const int HEIGHT = 24; 74 76 75 77 public MenuBar (Background bg, Gtk.AccelGroup ag) … … 237 239 return a11y_item; 238 240 } 239 241 242 243 244 private Gtk.Widget make_language_selector () 245 { 246 var selector_item = new Gtk.MenuItem (); 247 var hbox = new Gtk.HBox (false, 3); 248 hbox.show (); 249 selector_item.add (hbox); 250 var label= new Gtk.Label(_("Language selection")); 251 label.show(); 252 hbox.add(label); 253 selector_item.show (); 254 255 selector_item.submenu = new Gtk.Menu (); 256 Gtk.RadioMenuItem? default_item = null; 257 Gtk.RadioMenuItem? last_item = null; 258 259 var selected = new Gtk.RadioMenuItem.with_label (last_item == null ? null : last_item.get_group (), _("User defined (Language Support)")); 260 selected.show (); 261 selector_item.submenu.append (selected); 262 last_item = selected; 263 264 selected = new Gtk.RadioMenuItem.with_label (last_item == null ? null : last_item.get_group (), _("Spanish")); 265 selected.show (); 266 selector_item.submenu.append (selected); 267 last_item = selected; 268 selected.toggled.connect (spanish_toggled_cb); 269 270 selected = new Gtk.RadioMenuItem.with_label (last_item == null ? null : last_item.get_group (), _("Valencian")); 271 selected.show (); 272 selector_item.submenu.append (selected); 273 last_item = selected; 274 selected.toggled.connect (valencian_toggled_cb); 275 276 selected = new Gtk.RadioMenuItem.with_label (last_item == null ? null : last_item.get_group (), _("English")); 277 selected.show (); 278 selector_item.submenu.append (selected); 279 last_item = selected; 280 selected.toggled.connect (english_toggled_cb); 281 282 return selector_item; 283 } 284 285 private void spanish_toggled_cb(Gtk.CheckMenuItem item) 286 { 287 if(!item.active) 288 return; 289 user_language="es_ES"; 290 } 291 292 private void valencian_toggled_cb(Gtk.CheckMenuItem item) 293 { 294 if(!item.active) 295 return; 296 user_language="ca_ES@valencia"; 297 } 298 299 private void english_toggled_cb(Gtk.CheckMenuItem item) 300 { 301 if(!item.active) 302 return; 303 user_language="en"; 304 } 305 306 307 308 240 309 private Indicator.Object? load_indicator_file (string indicator_name) 241 310 { 242 311 string dir = Config.INDICATOR_FILE_DIR; … … 288 357 { 289 358 if (indicator_name == "ug-accessibility") 290 359 { 360 var language_selector=make_language_selector(); 361 insert (language_selector, (int) get_children ().length () - 1); 362 291 363 var a11y_item = make_a11y_indicator (); 292 364 insert (a11y_item, (int) get_children ().length () - 1); 293 365 } -
src/unity-greeter.vala
diff -uNar kk2/unity-greeter-16.04.2/src/unity-greeter.vala kk/unity-mod/src/unity-greeter.vala
old new 210 210 var result = false; 211 211 try 212 212 { 213 try 214 { 215 if (main_window.menubar.user_language!="") 216 greeter.set_language(main_window.menubar.user_language); 217 } 218 catch (Error llx) 219 { 220 //nothing to do 221 } 222 213 223 result = LightDM.greeter_start_session_sync (greeter, session); 214 224 } 215 225 catch (Error e)
Note: See TracBrowser
for help on using the repository browser.