On Wednesday 19 September 2007, Frans Pop wrote: > On Wednesday 19 September 2007, Frans Pop wrote: > > I've converted the templates to use Choices-C. This was needed to avoid > > having the same string for UTC everywhere (I use a variable instead). > > It also makes translation of timezones easier as translators now just > > get the English description instead of the technical timezone. > > This conversion to using Choices-C is probably a smart thing to do > anyway. If you like I can probably split that out fairly easily and > commit it, including changing the master PO files. As you may have seen, I've gone ahead an committed this change. It seemed a good enough improvement for (future) translations to be worth the conversion. After several minor fixes everything seems good and there should be no changes in status of translations. Splitting up of choices lists is now possible (will require changing both gen-templates and debian/common.templates.in), although IMO it will reduce context. The translators comment added by gen-templates should IMO be shortened further, maybe to just "This is the name of a time zone for $cc". In that case $cc should probably somehow be expanded to a country name. Attached my original patch rediffed against the current version and with several changes (untested). Also attached a script that will do most of the conversion of translations. This is mostly just for archiving because I don't think the patch is suitable for implementation (see earlier mail). The original request in this BR is effectively still open.
Index: debian/common.templates
===================================================================
--- debian/common.templates (revision 49433)
+++ debian/common.templates (working copy)
@@ -6,215 +6,215 @@
Template: tzsetup/country/AQ
Type: select
-Choices-C: Antarctica/McMurdo, Antarctica/South_Pole, Antarctica/Rothera, Antarctica/Palmer, Antarctica/Mawson, Antarctica/Davis, Antarctica/Casey, Antarctica/Vostok, Antarctica/DumontDUrville, Antarctica/Syowa
+Choices-C: Antarctica/McMurdo, Antarctica/South_Pole, Antarctica/Rothera, Antarctica/Palmer, Antarctica/Mawson, Antarctica/Davis, Antarctica/Casey, Antarctica/Vostok, Antarctica/DumontDUrville, Antarctica/Syowa, UTC
# Timezones for AQ.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: McMurdo, south pole, Rothera, Palmer, Mawson, Davis, Casey, Vostok, Dumont-d'Urville, Syowa
-_Description: Select a location in your time zone:
+_Choices: McMurdo, south pole, Rothera, Palmer, Mawson, Davis, Casey, Vostok, Dumont-d'Urville, Syowa, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/AU
Type: select
Default: Australia/Sydney
-Choices-C: Australia/Lord_Howe, Australia/Hobart, Australia/Melbourne, Australia/Sydney, Australia/Broken_Hill, Australia/Brisbane, Australia/Lindeman, Australia/Adelaide, Australia/Darwin, Australia/Perth
+Choices-C: Australia/Lord_Howe, Australia/Hobart, Australia/Melbourne, Australia/Sydney, Australia/Broken_Hill, Australia/Brisbane, Australia/Lindeman, Australia/Adelaide, Australia/Darwin, Australia/Perth, UTC
# Timezones for AU.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Lord Howe Island, Hobart, Melbourne, Sydney, Broken Hill, Brisbane, Lindeman, Adelaide, Darwin, Perth
-_Description: Select a city in your time zone:
+_Choices: Lord Howe Island, Hobart, Melbourne, Sydney, Broken Hill, Brisbane, Lindeman, Adelaide, Darwin, Perth, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/BR
Type: select
Default: America/Sao_Paulo
-Choices-C: America/Noronha, America/Belem, America/Fortaleza, America/Recife, America/Araguaina, America/Maceio, America/Bahia, America/Sao_Paulo, America/Campo_Grande, America/Cuiaba, America/Porto_Velho, America/Boa_Vista, America/Manaus, America/Eirunepe, America/Rio_Branco
+Choices-C: America/Noronha, America/Belem, America/Fortaleza, America/Recife, America/Araguaina, America/Maceio, America/Bahia, America/Sao_Paulo, America/Campo_Grande, America/Cuiaba, America/Porto_Velho, America/Boa_Vista, America/Manaus, America/Eirunepe, America/Rio_Branco, UTC
# Timezones for BR.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Noronha, Belem, Fortaleza, Recife, Araguaina, Maceio, Bahia, Sao Paulo, Campo Grande, Cuiaba, Porto Velho, Boa Vista, Manaus, Eirunepe, Rio Branco
-_Description: Select a city in your time zone:
+_Choices: Noronha, Belem, Fortaleza, Recife, Araguaina, Maceio, Bahia, Sao Paulo, Campo Grande, Cuiaba, Porto Velho, Boa Vista, Manaus, Eirunepe, Rio Branco, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/CA
Type: select
Default: Canada/Eastern
-Choices-C: Canada/Newfoundland, Canada/Atlantic, Canada/Eastern, Canada/Central, Canada/East-Saskatchewan, Canada/Saskatchewan, Canada/Mountain, Canada/Pacific, Canada/Yukon
+Choices-C: Canada/Newfoundland, Canada/Atlantic, Canada/Eastern, Canada/Central, Canada/East-Saskatchewan, Canada/Saskatchewan, Canada/Mountain, Canada/Pacific, Canada/Yukon, UTC
# Timezones for CA.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Newfoundland, Atlantic, Eastern, Central, East Saskatchewan, Saskatchewan, Mountain, Pacific, Yukon
-_Description: Select your time zone:
+_Choices: Newfoundland, Atlantic, Eastern, Central, East Saskatchewan, Saskatchewan, Mountain, Pacific, Yukon, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/CD
Type: select
-Choices-C: Africa/Kinshasa, Africa/Lubumbashi
+Choices-C: Africa/Kinshasa, Africa/Lubumbashi, UTC
# Timezones for CD.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Kinshasa, Lubumbashi
-_Description: Select a city in your time zone:
+_Choices: Kinshasa, Lubumbashi, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/CL
Type: select
-Choices-C: America/Santiago, Pacific/Easter
+Choices-C: America/Santiago, Pacific/Easter, UTC
# Timezones for CL.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Santiago, Easter Island
-_Description: Select your time zone:
+_Choices: Santiago, Easter Island, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/EC
Type: select
-Choices-C: America/Guayaquil, Pacific/Galapagos
+Choices-C: America/Guayaquil, Pacific/Galapagos, UTC
# Timezones for EC.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Guayaquil, Galapagos
-_Description: Select a location in your time zone:
+_Choices: Guayaquil, Galapagos, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/ES
Type: select
-Choices-C: Europe/Madrid, Africa/Ceuta, Atlantic/Canary
+Choices-C: Europe/Madrid, Africa/Ceuta, Atlantic/Canary, UTC
# Timezones for ES.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Madrid, Ceuta, Canary Islands
-_Description: Select a location in your time zone:
+_Choices: Madrid, Ceuta, Canary Islands, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/FM
Type: select
-Choices-C: Pacific/Yap, Pacific/Truk, Pacific/Ponape, Pacific/Kosrae
+Choices-C: Pacific/Yap, Pacific/Truk, Pacific/Ponape, Pacific/Kosrae, UTC
# Timezones for FM.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Yap, Truk, Ponape, Kosrae
-_Description: Select a location in your time zone:
+_Choices: Yap, Truk, Ponape, Kosrae, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/GL
Type: select
-Choices-C: America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule
+Choices-C: America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule, UTC
# Timezones for GL.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Godthab, Danmarkshavn, Scoresbysund, Thule
-_Description: Select a location in your time zone:
+_Choices: Godthab, Danmarkshavn, Scoresbysund, Thule, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/ID
Type: select
-Choices-C: Asia/Jakarta, Asia/Pontianak, Asia/Makassar, Asia/Jayapura
+Choices-C: Asia/Jakarta, Asia/Pontianak, Asia/Makassar, Asia/Jayapura, UTC
# Timezones for ID.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Jakarta, Pontianak, Makassar, Jayapura
-_Description: Select a city in your time zone:
+_Choices: Jakarta, Pontianak, Makassar, Jayapura, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/KI
Type: select
-Choices-C: Pacific/Tarawa, Pacific/Enderbury, Pacific/Kiritimati
+Choices-C: Pacific/Tarawa, Pacific/Enderbury, Pacific/Kiritimati, UTC
# Timezones for KI.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Tarawa (Gilbert Islands), Enderbury (Phoenix Islands), Kiritimati (Line Islands)
-_Description: Select your time zone:
+_Choices: Tarawa (Gilbert Islands), Enderbury (Phoenix Islands), Kiritimati (Line Islands), ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/KZ
Type: select
-Choices-C: Asia/Almaty, Asia/Qyzylorda, Asia/Aqtobe, Asia/Aqtau, Asia/Oral
+Choices-C: Asia/Almaty, Asia/Qyzylorda, Asia/Aqtobe, Asia/Aqtau, Asia/Oral, UTC
# Timezones for KZ.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Almaty, Qyzylorda, Aqtobe, Atyrau, Oral
-_Description: Select a city in your time zone:
+_Choices: Almaty, Qyzylorda, Aqtobe, Atyrau, Oral, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/MN
Type: select
-Choices-C: Asia/Ulaanbaatar, Asia/Hovd, Asia/Choibalsan
+Choices-C: Asia/Ulaanbaatar, Asia/Hovd, Asia/Choibalsan, UTC
# Timezones for MN.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Ulaanbaatar, Hovd, Choibalsan
-_Description: Select a city in your time zone:
+_Choices: Ulaanbaatar, Hovd, Choibalsan, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/MX
Type: select
-Choices-C: Mexico/General, Mexico/BajaSur, Mexico/BajaNorte
+Choices-C: Mexico/General, Mexico/BajaSur, Mexico/BajaNorte, UTC
# Timezones for MX.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Central, Mountain, Pacific
-_Description: Select your time zone:
+_Choices: Central, Mountain, Pacific, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/NZ
Type: select
-Choices-C: Pacific/Auckland, Pacific/Chatham
+Choices-C: Pacific/Auckland, Pacific/Chatham, UTC
# Timezones for NZ.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Auckland, Chatham Islands
-_Description: Select a location in your time zone:
+_Choices: Auckland, Chatham Islands, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/PF
Type: select
-Choices-C: Pacific/Tahiti, Pacific/Marquesas, Pacific/Gambier
+Choices-C: Pacific/Tahiti, Pacific/Marquesas, Pacific/Gambier, UTC
# Timezones for PF.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Tahiti (Society Islands), Marquesas Islands, Gambier Islands
-_Description: Select a location in your time zone:
+_Choices: Tahiti (Society Islands), Marquesas Islands, Gambier Islands, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/PT
Type: select
-Choices-C: Europe/Lisbon, Atlantic/Madeira, Atlantic/Azores
+Choices-C: Europe/Lisbon, Atlantic/Madeira, Atlantic/Azores, UTC
# Timezones for PT.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Lisbon, Madeira Islands, Azores
-_Description: Select a location in your time zone:
+_Choices: Lisbon, Madeira Islands, Azores, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/RU
Type: select
Default: Europe/Moscow
-Choices-C: Europe/Kaliningrad, Europe/Moscow, Europe/Samara, Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk, Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Sakhalin, Asia/Magadan, Asia/Kamchatka, Asia/Anadyr
+Choices-C: Europe/Kaliningrad, Europe/Moscow, Europe/Samara, Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk, Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Sakhalin, Asia/Magadan, Asia/Kamchatka, Asia/Anadyr, UTC
# Timezones for RU.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Moscow-01 - Kaliningrad, Moscow+00 - west Russia, Moscow+01 - Samara, Moscow+02 - Urals, Moscow+03 - west Siberia, Moscow+03 - Novosibirsk, Moscow+04 - Yenisei River, Moscow+05 - Lake Baikal, Moscow+06 - Lena River, Moscow+07 - Amur River, Moscow+07 - Sakhalin Island, Moscow+08 - Magadan, Moscow+09 - Kamchatka, Moscow+10 - Bering Sea
-_Description: Select your time zone:
+_Choices: Moscow-01 - Kaliningrad, Moscow+00 - west Russia, Moscow+01 - Samara, Moscow+02 - Urals, Moscow+03 - west Siberia, Moscow+03 - Novosibirsk, Moscow+04 - Yenisei River, Moscow+05 - Lake Baikal, Moscow+06 - Lena River, Moscow+07 - Amur River, Moscow+07 - Sakhalin Island, Moscow+08 - Magadan, Moscow+09 - Kamchatka, Moscow+10 - Bering Sea, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/UM
Type: select
-Choices-C: Pacific/Johnston, Pacific/Midway, Pacific/Wake
+Choices-C: Pacific/Johnston, Pacific/Midway, Pacific/Wake, UTC
# Timezones for UM.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Johnston Atoll, Midway Islands, Wake Island
-_Description: Select a location in your time zone:
+_Choices: Johnston Atoll, Midway Islands, Wake Island, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/US
Type: select
Default: US/Eastern
-Choices-C: US/Eastern, US/Central, US/Mountain, US/Pacific, US/Alaska, US/Hawaii, US/Arizona, US/East-Indiana, US/Samoa
+Choices-C: US/Eastern, US/Central, US/Mountain, US/Pacific, US/Alaska, US/Hawaii, US/Arizona, US/East-Indiana, US/Samoa, UTC
# Timezones for US.
#
# TRANSLATORS PLEASE NOTE: These are time zones. Many place names will not
# need translation from the English text, but some parts may be translatable.
-_Choices: Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Arizona, East Indiana, Samoa
-_Description: Select your time zone:
+_Choices: Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Arizona, East Indiana, Samoa, ${UTC}
+_Description: Select your time zone or UTC:
Index: debian/changelog
===================================================================
--- debian/changelog (revision 49433)
+++ debian/changelog (working copy)
@@ -3,8 +3,12 @@
* Convert time zone selection templates to use Choices-C. This makes the
huge note for translators largely redundant and should lead to less
translation errors.
+ * Add the option to select UTC as timezone. For countries with only
+ single timezone the question will be asked instead of the current
+ "dummy" confirmation dialog (only at medium/low priority); for other
+ countries the option is added at the bottom of the list.
- -- Frans Pop <fjp@debian.org> Sat, 22 Sep 2007 15:54:58 +0200
+ -- Frans Pop <fjp@debian.org> Sat, 22 Sep 2007 23:28:53 +0200
tzsetup (1:0.18) unstable; urgency=low
Index: debian/tzsetup-udeb.templates
===================================================================
--- debian/tzsetup-udeb.templates (revision 49433)
+++ debian/tzsetup-udeb.templates (working copy)
@@ -3,7 +3,12 @@
# finish-install progress bar item
_Description: Saving the time zone...
-Template: tzsetup/selected
-Type: note
-_Description: Selected time zone
- Based on your country, your time zone is ${ZONE}.
+Template: tzsetup/country/other
+Type: select
+_Description: Select your time zone or UTC:
+Choices-C: ${ZONE}, UTC
+Choices: ${ZONE}, ${UTC}
+
+Template: tzsetup/UTC
+Type: text
+_Description: Universal Time Coordinated (UTC)
Index: debian/common.templates.in
===================================================================
--- debian/common.templates.in (revision 49433)
+++ debian/common.templates.in (working copy)
@@ -5,131 +5,131 @@
Template: tzsetup/country/AQ
Type: select
-Choices-C: Antarctica/McMurdo, Antarctica/South_Pole, Antarctica/Rothera, Antarctica/Palmer, Antarctica/Mawson, Antarctica/Davis, Antarctica/Casey, Antarctica/Vostok, Antarctica/DumontDUrville, Antarctica/Syowa
-_Choices: McMurdo, south pole, Rothera, Palmer, Mawson, Davis, Casey, Vostok, Dumont-d'Urville, Syowa
-_Description: Select a location in your time zone:
+Choices-C: Antarctica/McMurdo, Antarctica/South_Pole, Antarctica/Rothera, Antarctica/Palmer, Antarctica/Mawson, Antarctica/Davis, Antarctica/Casey, Antarctica/Vostok, Antarctica/DumontDUrville, Antarctica/Syowa, UTC
+_Choices: McMurdo, south pole, Rothera, Palmer, Mawson, Davis, Casey, Vostok, Dumont-d'Urville, Syowa, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/AU
Type: select
Default: Australia/Sydney
-Choices-C: Australia/Lord_Howe, Australia/Hobart, Australia/Melbourne, Australia/Sydney, Australia/Broken_Hill, Australia/Brisbane, Australia/Lindeman, Australia/Adelaide, Australia/Darwin, Australia/Perth
-_Choices: Lord Howe Island, Hobart, Melbourne, Sydney, Broken Hill, Brisbane, Lindeman, Adelaide, Darwin, Perth
-_Description: Select a city in your time zone:
+Choices-C: Australia/Lord_Howe, Australia/Hobart, Australia/Melbourne, Australia/Sydney, Australia/Broken_Hill, Australia/Brisbane, Australia/Lindeman, Australia/Adelaide, Australia/Darwin, Australia/Perth, UTC
+_Choices: Lord Howe Island, Hobart, Melbourne, Sydney, Broken Hill, Brisbane, Lindeman, Adelaide, Darwin, Perth, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/BR
Type: select
Default: America/Sao_Paulo
-Choices-C: America/Noronha, America/Belem, America/Fortaleza, America/Recife, America/Araguaina, America/Maceio, America/Bahia, America/Sao_Paulo, America/Campo_Grande, America/Cuiaba, America/Porto_Velho, America/Boa_Vista, America/Manaus, America/Eirunepe, America/Rio_Branco
-_Choices: Noronha, Belem, Fortaleza, Recife, Araguaina, Maceio, Bahia, Sao Paulo, Campo Grande, Cuiaba, Porto Velho, Boa Vista, Manaus, Eirunepe, Rio Branco
-_Description: Select a city in your time zone:
+Choices-C: America/Noronha, America/Belem, America/Fortaleza, America/Recife, America/Araguaina, America/Maceio, America/Bahia, America/Sao_Paulo, America/Campo_Grande, America/Cuiaba, America/Porto_Velho, America/Boa_Vista, America/Manaus, America/Eirunepe, America/Rio_Branco, UTC
+_Choices: Noronha, Belem, Fortaleza, Recife, Araguaina, Maceio, Bahia, Sao Paulo, Campo Grande, Cuiaba, Porto Velho, Boa Vista, Manaus, Eirunepe, Rio Branco, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/CA
Type: select
Default: Canada/Eastern
-Choices-C: Canada/Newfoundland, Canada/Atlantic, Canada/Eastern, Canada/Central, Canada/East-Saskatchewan, Canada/Saskatchewan, Canada/Mountain, Canada/Pacific, Canada/Yukon
-_Choices: Newfoundland, Atlantic, Eastern, Central, East Saskatchewan, Saskatchewan, Mountain, Pacific, Yukon
-_Description: Select your time zone:
+Choices-C: Canada/Newfoundland, Canada/Atlantic, Canada/Eastern, Canada/Central, Canada/East-Saskatchewan, Canada/Saskatchewan, Canada/Mountain, Canada/Pacific, Canada/Yukon, UTC
+_Choices: Newfoundland, Atlantic, Eastern, Central, East Saskatchewan, Saskatchewan, Mountain, Pacific, Yukon, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/CD
Type: select
-Choices-C: Africa/Kinshasa, Africa/Lubumbashi
-_Choices: Kinshasa, Lubumbashi
-_Description: Select a city in your time zone:
+Choices-C: Africa/Kinshasa, Africa/Lubumbashi, UTC
+_Choices: Kinshasa, Lubumbashi, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/CL
Type: select
-Choices-C: America/Santiago, Pacific/Easter
-_Choices: Santiago, Easter Island
-_Description: Select your time zone:
+Choices-C: America/Santiago, Pacific/Easter, UTC
+_Choices: Santiago, Easter Island, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/EC
Type: select
-Choices-C: America/Guayaquil, Pacific/Galapagos
-_Choices: Guayaquil, Galapagos
-_Description: Select a location in your time zone:
+Choices-C: America/Guayaquil, Pacific/Galapagos, UTC
+_Choices: Guayaquil, Galapagos, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/ES
Type: select
-Choices-C: Europe/Madrid, Africa/Ceuta, Atlantic/Canary
-_Choices: Madrid, Ceuta, Canary Islands
-_Description: Select a location in your time zone:
+Choices-C: Europe/Madrid, Africa/Ceuta, Atlantic/Canary, UTC
+_Choices: Madrid, Ceuta, Canary Islands, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/FM
Type: select
-Choices-C: Pacific/Yap, Pacific/Truk, Pacific/Ponape, Pacific/Kosrae
-_Choices: Yap, Truk, Ponape, Kosrae
-_Description: Select a location in your time zone:
+Choices-C: Pacific/Yap, Pacific/Truk, Pacific/Ponape, Pacific/Kosrae, UTC
+_Choices: Yap, Truk, Ponape, Kosrae, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/GL
Type: select
-Choices-C: America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule
-_Choices: Godthab, Danmarkshavn, Scoresbysund, Thule
-_Description: Select a location in your time zone:
+Choices-C: America/Godthab, America/Danmarkshavn, America/Scoresbysund, America/Thule, UTC
+_Choices: Godthab, Danmarkshavn, Scoresbysund, Thule, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/ID
Type: select
-Choices-C: Asia/Jakarta, Asia/Pontianak, Asia/Makassar, Asia/Jayapura
-_Choices: Jakarta, Pontianak, Makassar, Jayapura
-_Description: Select a city in your time zone:
+Choices-C: Asia/Jakarta, Asia/Pontianak, Asia/Makassar, Asia/Jayapura, UTC
+_Choices: Jakarta, Pontianak, Makassar, Jayapura, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/KI
Type: select
-Choices-C: Pacific/Tarawa, Pacific/Enderbury, Pacific/Kiritimati
-_Choices: Tarawa (Gilbert Islands), Enderbury (Phoenix Islands), Kiritimati (Line Islands)
-_Description: Select your time zone:
+Choices-C: Pacific/Tarawa, Pacific/Enderbury, Pacific/Kiritimati, UTC
+_Choices: Tarawa (Gilbert Islands), Enderbury (Phoenix Islands), Kiritimati (Line Islands), ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/KZ
Type: select
-Choices-C: Asia/Almaty, Asia/Qyzylorda, Asia/Aqtobe, Asia/Aqtau, Asia/Oral
-_Choices: Almaty, Qyzylorda, Aqtobe, Atyrau, Oral
-_Description: Select a city in your time zone:
+Choices-C: Asia/Almaty, Asia/Qyzylorda, Asia/Aqtobe, Asia/Aqtau, Asia/Oral, UTC
+_Choices: Almaty, Qyzylorda, Aqtobe, Atyrau, Oral, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/MN
Type: select
-Choices-C: Asia/Ulaanbaatar, Asia/Hovd, Asia/Choibalsan
-_Choices: Ulaanbaatar, Hovd, Choibalsan
-_Description: Select a city in your time zone:
+Choices-C: Asia/Ulaanbaatar, Asia/Hovd, Asia/Choibalsan, UTC
+_Choices: Ulaanbaatar, Hovd, Choibalsan, ${UTC}
+_Description: Select a city in your time zone or UTC:
Template: tzsetup/country/MX
Type: select
-Choices-C: Mexico/General, Mexico/BajaSur, Mexico/BajaNorte
-_Choices: Central, Mountain, Pacific
-_Description: Select your time zone:
+Choices-C: Mexico/General, Mexico/BajaSur, Mexico/BajaNorte, UTC
+_Choices: Central, Mountain, Pacific, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/NZ
Type: select
-Choices-C: Pacific/Auckland, Pacific/Chatham
-_Choices: Auckland, Chatham Islands
-_Description: Select a location in your time zone:
+Choices-C: Pacific/Auckland, Pacific/Chatham, UTC
+_Choices: Auckland, Chatham Islands, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/PF
Type: select
-Choices-C: Pacific/Tahiti, Pacific/Marquesas, Pacific/Gambier
-_Choices: Tahiti (Society Islands), Marquesas Islands, Gambier Islands
-_Description: Select a location in your time zone:
+Choices-C: Pacific/Tahiti, Pacific/Marquesas, Pacific/Gambier, UTC
+_Choices: Tahiti (Society Islands), Marquesas Islands, Gambier Islands, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/PT
Type: select
-Choices-C: Europe/Lisbon, Atlantic/Madeira, Atlantic/Azores
-_Choices: Lisbon, Madeira Islands, Azores
-_Description: Select a location in your time zone:
+Choices-C: Europe/Lisbon, Atlantic/Madeira, Atlantic/Azores, UTC
+_Choices: Lisbon, Madeira Islands, Azores, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/RU
Type: select
Default: Europe/Moscow
-Choices-C: Europe/Kaliningrad, Europe/Moscow, Europe/Samara, Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk, Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Sakhalin, Asia/Magadan, Asia/Kamchatka, Asia/Anadyr
-_Choices: Moscow-01 - Kaliningrad, Moscow+00 - west Russia, Moscow+01 - Samara, Moscow+02 - Urals, Moscow+03 - west Siberia, Moscow+03 - Novosibirsk, Moscow+04 - Yenisei River, Moscow+05 - Lake Baikal, Moscow+06 - Lena River, Moscow+07 - Amur River, Moscow+07 - Sakhalin Island, Moscow+08 - Magadan, Moscow+09 - Kamchatka, Moscow+10 - Bering Sea
-_Description: Select your time zone:
+Choices-C: Europe/Kaliningrad, Europe/Moscow, Europe/Samara, Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk, Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Sakhalin, Asia/Magadan, Asia/Kamchatka, Asia/Anadyr, UTC
+_Choices: Moscow-01 - Kaliningrad, Moscow+00 - west Russia, Moscow+01 - Samara, Moscow+02 - Urals, Moscow+03 - west Siberia, Moscow+03 - Novosibirsk, Moscow+04 - Yenisei River, Moscow+05 - Lake Baikal, Moscow+06 - Lena River, Moscow+07 - Amur River, Moscow+07 - Sakhalin Island, Moscow+08 - Magadan, Moscow+09 - Kamchatka, Moscow+10 - Bering Sea, ${UTC}
+_Description: Select your time zone or UTC:
Template: tzsetup/country/UM
Type: select
-Choices-C: Pacific/Johnston, Pacific/Midway, Pacific/Wake
-_Choices: Johnston Atoll, Midway Islands, Wake Island
-_Description: Select a location in your time zone:
+Choices-C: Pacific/Johnston, Pacific/Midway, Pacific/Wake, UTC
+_Choices: Johnston Atoll, Midway Islands, Wake Island, ${UTC}
+_Description: Select a location in your time zone or UTC:
Template: tzsetup/country/US
Type: select
Default: US/Eastern
-Choices-C: US/Eastern, US/Central, US/Mountain, US/Pacific, US/Alaska, US/Hawaii, US/Arizona, US/East-Indiana, US/Samoa
-_Choices: Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Arizona, East Indiana, Samoa
-_Description: Select your time zone:
+Choices-C: US/Eastern, US/Central, US/Mountain, US/Pacific, US/Alaska, US/Hawaii, US/Arizona, US/East-Indiana, US/Samoa, UTC
+_Choices: Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Arizona, East Indiana, Samoa, ${UTC}
+_Description: Select your time zone or UTC:
Index: gen-templates
===================================================================
--- gen-templates (revision 49433)
+++ gen-templates (working copy)
@@ -72,10 +72,10 @@
print STDERR "warning: autogenerated template for $cc should be manually reviewed\n";
print "\nTemplate: tzsetup/country/$cc\n";
print "Type: select\n";
- print "Choices-C: $list\n";
+ print "Choices-C: $list, UTC\n";
print honking_big_comment($cc);
- print "_Choices: $englist\n";
- print "_Description: Select your time zone:\n";
+ print "_Choices: $englist, \${UTC}\n";
+ print "_Description: Select your time zone or UTC:\n";
}
else {
print TZMAP "$cc $list\n";
Index: tzsetup
===================================================================
--- tzsetup (revision 49433)
+++ tzsetup (working copy)
@@ -6,10 +6,15 @@
db_get debian-installer/country
CC="$RET"
+
+db_metaget tzsetup/UTC Description
+UTC_desc="$RET"
+
# per-country templates are used for countries with multiple choices
if db_get "tzsetup/country/$CC"; then
db_register "tzsetup/country/$CC" time/zone
- db_input high time/zone || :
+ db_subst time/zone UTC "$UTC_desc"
+ db_input high time/zone || true
if ! db_go; then
exit 10 # back to menu
fi
@@ -19,10 +24,12 @@
db_fget time/zone seen
if [ "$RET" = false ]; then
zone=$(grep "^$CC" /usr/share/tzsetup/tzmap | cut -d ' ' -f 2)
+
+ db_register tzsetup/country/other time/zone
+ db_subst time/zone ZONE $zone
+ db_subst time/zone UTC "$UTC_desc"
db_set time/zone "$zone"
-
- db_subst tzsetup/selected ZONE $zone
- db_input medium tzsetup/selected || true
+ db_input medium time/zone || true
if ! db_go; then
exit 10 # back to menu
fi
#/bin/bash
for po in *.po*; do
echo $po
msgattrib --no-wrap $po >$po.tmp
sed -i "/msg\(str\|id\).*,.*[^:.]\"$/s/\"$/, \${UTC}\"/" $po.tmp
msgattrib $po.tmp >$po
rm $po.tmp
done
# Check for incorrect replacements (need manual correction)
for i in *.po*; do
echo -n "$i: "
svn diff $i | grep -c "^+[^+].*UTC"
done
Attachment:
signature.asc
Description: This is a digitally signed message part.