Author: hawk
Date: Sun Dec 4 00:42:12 2005
New Revision: 6592
Modified:
bootdisk/trunk/batch-installer/ui/ui-conf
Log:
- allow custom field in ui-lang, added en_US to predefined values
- replaced selection dialog in ui-clock_utc with switchable yes/no
- replaced ui-timezone with selectable list of all timezones
Modified: bootdisk/trunk/batch-installer/ui/ui-conf
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-conf (original)
+++ bootdisk/trunk/batch-installer/ui/ui-conf Sun Dec 4 00:42:12 2005
@@ -100,6 +100,8 @@
<br>
<meta title="$(nls "Default language")">
<menu id=res_menu res=1>
+ <item id=ui_custom>${custom_text}
+ <item id=en_US>$(nls English) (en__US)
<item id=pl_PL>$(nls Polish) (pl__PL)
<item id=de_DE>$(nls German) (de__DE)
<item id="">$(nls "Do not set")
@@ -109,41 +111,51 @@
}
ui-clock_utc () {
-dml <<EOF
- <br>`nls "Does your system clock runs in UTC?"`
- <br>
- <meta title="$(nls "UTC?")">
- <menu id=res_menu res=1>
- <item id=yes>$(nls "Yes.")
- <item id=no>$(nls "No.")
- </menu>
- $@
-EOF
+if test "x$clock_utc" = "xyes"; then
+ echo 'res_menu="no"'
+else
+ echo 'res_menu="yes"'
+fi
+echo 'res=1'
}
ui-timezone () {
-dml <<EOF
-<br>`nls "Choose the timezone"`
-<br>
-<input id=res_menu caption="$timezone">
-<br>
+Africa_zones=" Abidjan Accra Addis_Ababa Algiers Asmera Bamako Bangui Banjul
Bissau Blantyre Brazzaville Bujumbura Cairo Casablanca Ceuta Conakry Dakar
Dar_es_Salaam Djibouti Douala El_Aaiun Freetown Gaborone Harare Johannesburg
Kampala Khartoum Kigali Kinshasa Lagos Libreville Lome Luanda Lubumbashi Lusaka
Malabo Maputo Maseru Mbabane Mogadishu Monrovia Nairobi Ndjamena Niamey
Nouakchott Ouagadougou Porto-Novo Sao_Tome Timbuktu Tripoli Tunis Windhoek"
+America_zones=" Adak Anchorage Anguilla Antigua Araguaina Aruba Asuncion Atka
Barbados Belem Belize Boa_Vista Bogota Boise Buenos_Aires Cambridge_Bay Cancun
Caracas Catamarca Cayenne Cayman Chicago Chihuahua Cordoba Costa_Rica Cuiaba
Curacao Dawson Dawson_Creek Denver Detroit Dominica Edmonton Eirunepe
El_Salvador Ensenada Fort_Wayne Fortaleza Glace_Bay Godthab Goose_Bay
Grand_Turk Grenada Guadeloupe Guatemala Guayaquil Guyana Halifax Havana
Hermosillo Indiana/ Indianapolis Inuvik Iqaluit Jamaica Jujuy Juneau Kentucky/
Knox_IN La_Paz Lima Los_Angeles Louisville Maceio Managua Manaus Martinique
Mazatlan Mendoza Menominee Merida Mexico_City Miquelon Monterrey Montevideo
Montreal Montserrat Nassau New_York Nipigon Nome Noronha Panama Pangnirtung
Paramaribo Phoenix Port-au-Prince Port_of_Spain Porto_Acre Porto_Velho
Puerto_Rico Rainy_River Rankin_Inlet Recife Regina Rio_Branco Rosario Santiago
Santo_Domingo Sao_Paulo Scoresbysund Shiprock St_Johns St_Kitts St_Lucia
St_Thomas St!
_Vincent Swift_Current Tegucigalpa Thule Thunder_Bay Tijuana Tortola Vancouver
Virgin Whitehorse Winnipeg Yakutat Yellowknife"
+Antarctica_zones=" Casey Davis DumontDUrville Mawson McMurdo Palmer South_Pole
Syowa Vostok"
+Arctic_zones=" Longyearbyen"
+Asia_zones=" Aden Almaty Amman Anadyr Aqtau Aqtobe Ashgabat Ashkhabad Baghdad
Bahrain Baku Bangkok Beirut Bishkek Brunei Calcutta Chungking Colombo Dacca
Damascus Dhaka Dili Dubai Dushanbe Gaza Harbin Hong_Kong Hovd Irkutsk Istanbul
Jakarta Jayapura Jerusalem Kabul Kamchatka Karachi Kashgar Katmandu Krasnoyarsk
Kuala_Lumpur Kuching Kuwait Macao Magadan Manila Muscat Nicosia Novosibirsk
Omsk Phnom_Penh Pontianak Pyongyang Qatar Rangoon Riyadh Riyadh87 Riyadh88
Riyadh89 Saigon Samarkand Seoul Shanghai Singapore Taipei Tashkent Tbilisi
Tehran Tel_Aviv Thimbu Thimphu Tokyo Ujung_Pandang Ulaanbaatar Ulan_Bator
Urumqi Vientiane Vladivostok Yakutsk Yekaterinburg Yerevan"
+Atlantic_zones=" Azores Bermuda Canary Cape_Verde Faeroe Jan_Mayen Madeira
Reykjavik South_Georgia St_Helena Stanley"
+Australia_zones=" ACT Adelaide Brisbane Broken_Hill Canberra Darwin Hobart LHI
Lindeman Lord_Howe Melbourne NSW North Perth Queensland South Sydney Tasmania
Victoria West Yancowinna"
+Brazil_zones=" Acre DeNoronha East West"
+Canada_zones=" Atlantic Central East-Saskatchewan Eastern Mountain
Newfoundland Pacific Saskatchewan Yukon"
+Chile_zones=" Continental EasterIsland"
+Etc_zones=" GMT GMT+0 GMT+1 GMT+10 GMT+11 GMT+12 GMT+2 GMT+3 GMT+4 GMT+5 GMT+6
GMT+7 GMT+8 GMT+9 GMT-0 GMT-1 GMT-10 GMT-11 GMT-12 GMT-13 GMT-14 GMT-2 GMT-3
GMT-4 GMT-5 GMT-6 GMT-7 GMT-8 GMT-9 GMT0 Greenwich UCT UTC Universal Zulu"
+Europe_zones=" Amsterdam Andorra Athens Belfast Belgrade Berlin Bratislava
Brussels Bucharest Budapest Chisinau Copenhagen Dublin Gibraltar Helsinki
Istanbul Kaliningrad Kiev Lisbon Ljubljana London Luxembourg Madrid Malta Minsk
Monaco Moscow Nicosia Oslo Paris Prague Riga Rome Samara San_Marino Sarajevo
Simferopol Skopje Sofia Stockholm Tallinn Tirane Tiraspol Uzhgorod Vaduz
Vatican Vienna Vilnius Warsaw Zagreb Zaporozhye Zurich"
+Indian_zones=" Antananarivo Chagos Christmas Cocos Comoro Kerguelen Mahe
Maldives Mauritius Mayotte Reunion"
+Mexico_zones=" BajaNorte BajaSur General"
+Mideast_zones=" Riyadh87 Riyadh88 Riyadh89"
+Pacific_zones=" Apia Auckland Chatham Easter Efate Enderbury Fakaofo Fiji
Funafuti Galapagos Gambier Guadalcanal Guam Honolulu Johnston Kiritimati Kosrae
Kwajalein Majuro Marquesas Midway Nauru Niue Norfolk Noumea Pago_Pago Palau
Pitcairn Ponape Port_Moresby Rarotonga Saipan Samoa Tahiti Tarawa Tongatapu
Truk Wake Wallis Yap"
+SystemV_zones=" AST4 AST4ADT CST6 CST6CDT EST5 EST5EDT HST10 MST7 MST7MDT PST8
PST8PDT YST9 YST9YDT"
+US_zones=" Alaska Aleutian Arizona Central East-Indiana Eastern Hawaii
Indiana-Starke Michigan Mountain Pacific Samoa"
+# this wouldn't work... (installer-sysconf issue)
+#root_zones=" CET Cuba EET Egypt Eire Factory GB-Eire GB Greenwich GMT GMT+0
GMT-0 GMT0 Hongkong Iceland Iran Israel Jamaica Japan Libya MET PRC NZ NZ-CHAT
Kwajalein Poland Portugal ROC ROK Singapore Turkey UCT MST CST6CDT EST EST5EDT
HST MST7MDT Navajo PST8PDT W-SU WET Zulu UTC Universal"
+zone_dirs=" Africa America Antarctica Arctic Asia Atlantic Australia Brazil
Canada Chile Etc Europe Indian Mexico Mideast Pacific SystemV US"
+ dml <<EOF
+<meta title="$(nls "Choose the timezone")">
+<menu id=res_menu res=1 selected=$timezone width=40 height=20>
+$(
+for f in $zone_dirs ; do
+ for e in `eval echo \\$${f}_zones` ; do
+ echo "<item id=$f/$e>$f/$e"
+ done
+done
+)
+</menu>
$@
EOF
}
-ui-timezone () {
-dml <<EOF
- <br>`nls "Choose the timezone"`
- <br>
- <meta title="$(nls "Timezone")">
- <menu id=res_menu res=1>
- <item id=Warsaw>$(nls Warsaw)
- <item id="">$(nls "Do not set")
- </menu>
- $@
-EOF
-}
-
ui-net_config () {
dml <<EOF
<br>`nls "How to configure the network?"`
@@ -295,3 +307,4 @@
save_sys_config
done
+
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
