View | Details | Raw Unified | Return to bug 38512
Collapse All | Expand All

(-)a/umc/js/setup/ApplianceWizard.js (+18 lines)
 Lines 350-355   define([ Link Here 
350
					type: ComboBox,
350
					type: ComboBox,
351
					name: 'locale/default',
351
					name: 'locale/default',
352
					label: _('Default system locale'),
352
					label: _('Default system locale'),
353
					value: 'en_US.UTF-8:UTF-8',
353
					umcpCommand: lang.hitch(this, 'umcpCommand'),
354
					umcpCommand: lang.hitch(this, 'umcpCommand'),
354
					dynamicOptions: {pattern: '*'},
355
					dynamicOptions: {pattern: '*'},
355
					dynamicValues: 'setup/lang/locales'
356
					dynamicValues: 'setup/lang/locales'
 Lines 357-368   define([ Link Here 
357
					type: ComboBox,
358
					type: ComboBox,
358
					name: 'timezone',
359
					name: 'timezone',
359
					label: _('Time zone'),
360
					label: _('Time zone'),
361
					value: 'America/New_York',
360
					umcpCommand: lang.hitch(this, 'umcpCommand'),
362
					umcpCommand: lang.hitch(this, 'umcpCommand'),
361
					dynamicValues: 'setup/lang/timezones'
363
					dynamicValues: 'setup/lang/timezones'
362
				}, {
364
				}, {
363
					type: ComboBox,
365
					type: ComboBox,
364
					name: 'xorg/keyboard/options/XkbLayout',
366
					name: 'xorg/keyboard/options/XkbLayout',
365
					label: _('Keyboard layout'),
367
					label: _('Keyboard layout'),
368
					value: 'us'
366
					umcpCommand: lang.hitch(this, 'umcpCommand'),
369
					umcpCommand: lang.hitch(this, 'umcpCommand'),
367
					dynamicValues: 'setup/lang/keyboard/layout',
370
					dynamicValues: 'setup/lang/keyboard/layout',
368
					onChange: lang.hitch(this, function(value) {
371
					onChange: lang.hitch(this, function(value) {
 Lines 1237-1246   define([ Link Here 
1237
					locale: 'de_DE.UTF-8:UTF-8',
1240
					locale: 'de_DE.UTF-8:UTF-8',
1238
					keyboard: 'de'
1241
					keyboard: 'de'
1239
				},
1242
				},
1243
				'de-AT': {
1244
					timezone: 'Europe/Vienna',
1245
					locale: 'de_AT.UTF-8:UTF-8',
1246
					keyboard: 'at'
1247
				},
1248
				'de-CH': {
1249
					timezone: 'Europe/Zurich',
1250
					locale: 'de_CH.UTF-8:UTF-8',
1251
					keyboard: 'ch'
1252
				},
1240
				'en-US': {
1253
				'en-US': {
1241
					timezone: 'America/New_York',
1254
					timezone: 'America/New_York',
1242
					locale: 'en_US.UTF-8:UTF-8',
1255
					locale: 'en_US.UTF-8:UTF-8',
1243
					keyboard: 'us'
1256
					keyboard: 'us'
1257
				},
1258
				'en-GB': {
1259
					timezone: 'Europe/London',
1260
					locale: 'en_GB.UTF-8:UTF-8',
1261
					keyboard: 'gb'
1244
				}
1262
				}
1245
			};
1263
			};
1246
			this._setLocaleValues(defaults[i18nTools.defaultLang()] || {});
1264
			this._setLocaleValues(defaults[i18nTools.defaultLang()] || {});

Return to bug 38512