Index: openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml 7 Jun 2005 07:44:13 -0000 1.7
+++ openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml 7 Jun 2005 10:59:58 -0000 1.8
@@ -23,245 +23,6 @@
Citizenships
Copy
Country
- Andorra
- United Arab Emirates
- Afghanistan
- Antigua and Barbuda
- Anguilla
- Albania
- Armenia
- Netherlands Antilles
- Angola
- Antarctica
- Argentina
- American Samoa
- Austria
- Australia
- Aruba
- Azerbaijan
- Bosnia and Herzegovina
- Barbados
- Bangladesh
- Belgium
- Burkina Faso
- Bulgaria
- Bahrain
- Burundi
- Benin
- Bermuda
- Brunei Darussalam
- Bolivia
- Brazil
- Bahamas
- Bhutan
- Bouvet Island
- Botswana
- Belarus
- Belize
- Canada
- Cocos (Keeling) Islands
- Congo, The Democratic Republic of the
- Central African Republic
- Congo
- Switzerland
- Cote D'ivoire
- Cook Islands
- Chile
- Cameroon
- China
- Colombia
- Costa Rica
- Cuba
- Cape Verde
- Christmas Island
- Cyprus
- Czech Republic
- Germany
- Djibouti
- Denmark
- Dominica
- Dominican Republic
- Algeria
- Ecuador
- Estonia
- Egypt
- Western Sahara
- Eritrea
- Spain
- Ethiopia
- Finland
- Fiji
- Falkland Islands (Malvinas)
- Micronesia, Federated States of
- Faroe Islands
- France
- Gabon
- United Kingdom
- Grenada
- Georgia
- French Guiana
- Ghana
- Gibraltar
- Greenland
- Gambia
- Guinea
- Guadeloupe
- Equatorial Guinea
- Greece
- South Georgia and the South Sandwich Islands
- Guatemala
- Guam
- Guinea-Bissau
- Guyana
- Hong Kong
- Heard Island and Mcdonald Islands
- Honduras
- Croatia
- Haiti
- Hungary
- Indonesia
- Ireland
- Israel
- India
- British Indian Ocean Territory
- Iraq
- Iran, Islamic Republic of
- Iceland
- Italy
- Jamaica
- Jordan
- Japan
- Kenya
- Kyrgyzstan
- Cambodia
- Kiribati
- Comoros
- Saint Kitts and Nevis
- Korea, Democratic People's Republic of
- Korea, Republic of
- Kuwait
- Cayman Islands
- Kazakstan
- Lao People's Democratic Republic
- Lebanon
- Saint Lucia
- Liechtenstein
- Sri Lanka
- Liberia
- Lesotho
- Lithuania
- Luxembourg
- Latvia
- Libyan Arab Jamahiriya
- Morocco
- Monaco
- Moldova, Republic of
- Madagascar
- Marshall Islands
- Macedonia, The Former Yugoslav Republic of
- Mali
- Myanmar
- Mongolia
- Macau
- Northern Mariana Islands
- Martinique
- Mauritania
- Montserrat
- Malta
- Mauritius
- Maldives
- Malawi
- Mexico
- Malaysia
- Mozambique
- Namibia
- New Caledonia
- Niger
- Norfolk Island
- Nigeria
- Nicaragua
- Netherlands
- Norway
- Nepal
- Nauru
- Niue
- New Zealand
- Oman
- Panama
- Peru
- French Polynesia
- Papua New Guinea
- Philippines
- Pakistan
- Poland
- Saint Pierre and Miquelon
- Pitcairn
- Puerto Rico
- Palestinian Territory, Occupied
- Portugal
- Palau
- Paraguay
- Qatar
- Reunion
- Romania
- Russian Federation
- Rwanda
- Saudi Arabia
- Solomon Islands
- Seychelles
- Sudan
- Sweden
- Singapore
- Saint Helena
- Slovenia
- Svalbard and Jan Mayen
- Slovakia
- Sierra Leone
- San Marino
- Senegal
- Somalia
- Suriname
- Sao Tome and Principe
- El Salvador
- Syrian Arab Republic
- Swaziland
- Turks and Caicos Islands
- Chad
- French Southern Territories
- Togo
- Thailand
- Tajikistan
- Tokelau
- Turkmenistan
- Tunisia
- Tonga
- East Timor
- Turkey
- Trinidad And Tobago
- Tuvalu
- Taiwan, Province of China
- Tanzania, United Republic of
- Ukraine
- Uganda
- United States Minor Outlying Islands
- United States
- Uruguay
- Uzbekistan
- Holy See (Vatican City State)
- Saint Vincent and the Grenadines
- Venezuela
- Virgin Islands, British
- Virgin Islands, U.S.
- Viet Nam
- Vanuatu
- Wallis And Futuna
- Samoa
- Yemen
- Mayotte
- Yugoslavia
- South Africa
- Zambia
- Zimbabwe
Date
Date of Inquiry
Dates of Inquiry
Index: openacs-4/packages/ams/tcl/address-widget-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/ams/tcl/address-widget-procs-postgresql.xql 18 May 2005 17:11:48 -0000 1.3
+++ openacs-4/packages/ams/tcl/address-widget-procs-postgresql.xql 7 Jun 2005 10:59:58 -0000 1.4
@@ -2,9 +2,9 @@
-
+
- select default_name, iso from countries s
+ select iso from countries s
Index: openacs-4/packages/ams/tcl/address-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl 21 May 2005 21:50:16 -0000 1.5
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl 7 Jun 2005 10:59:58 -0000 1.6
@@ -98,39 +98,23 @@
# There is no HTTP connection - resort to system locale
set locale [lang::system::locale]
}
- return [util_memoize [list template::util::address::country_options_not_cached -locale $locale]]
+# return [util_memoize [list template::util::address::country_options_not_cached -locale $locale]]
+ return [template::util::address::country_options_not_cached]
}
ad_proc -public template::util::address::country_options_not_cached {
{-locale "en_US"}
} {
Returns the country list.
} {
- set country_list [db_list_of_lists get_countries {}]
+ set country_code_list [db_list get_country_codes {}]
set return_country_list [list]
set reserved_country_codes [parameter::get_from_package_key -parameter "DefaultISOCountryCode" -package_key "ams" -default ""]
- foreach country $country_list {
- set this_locale $locale
- set country_name_db [lindex $country 0]
- set country_code_db [lindex $country 1]
- set package_key "ams"
- set message_key "country_${country_code_db}"
- set key "${package_key}.${message_key}"
- if { [string is false [lang::message::message_exists_p $locale $key]] } {
- if { [string is false [lang::message::message_exists_p "en_US" $key]] } {
- lang::message::register $locale $package_key $message_key $country_name_db
- } else {
- set this_locale "en_US"
- }
+ foreach country $country_code_list {
+ if { [lsearch $reserved_country_codes $country] < 0 } {
+ lappend return_country_list [list [lang::util::localize "#ref-countries.${country}#"] $country]
}
- # mgeddert customization for mbbs
- if { [lsearch $reserved_country_codes $country_code_db] < 0 } {
- # the reason not to use the "list" command here is because a curly bracket
- # needs to be used in the list for countries with a single word name
- # so that alphabetizing (via lsort) works later on in this proc
- lappend return_country_list "{[lang::message::lookup $this_locale $key]} {$country_code_db}"
- }
}
set country_code [list]
if { [exists_and_not_null reserved_country_codes] } {