diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-12-05 05:55:26 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-12-05 05:55:26 +0000 |
| commit | 2eaa8e67c0af9f5b0f2b7fd5c355c5d7a583011f (patch) | |
| tree | f7f7fc29b10ba8ffbafa68f96e7eda63299b1470 /actionpack | |
| parent | b6d9c17af124ff64a9a189b49260c2928ac6ec7e (diff) | |
| download | rails-2eaa8e67c0af9f5b0f2b7fd5c355c5d7a583011f.tar.gz rails-2eaa8e67c0af9f5b0f2b7fd5c355c5d7a583011f.tar.bz2 rails-2eaa8e67c0af9f5b0f2b7fd5c355c5d7a583011f.zip | |
Remove Great Britain from the Country select helper to ensure consistency with iso 3166's long_names. Closes #6872 [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8277 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/template/form_options_helper_test.rb | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 10d539b413..0f1d2b02bf 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -319,8 +319,7 @@ module ActionView "Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)", "Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia", - "French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", - "Great Britain", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea", + "French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Heard and McDonald Islands", "Holy See (Vatican City State)", "Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Iran, Islamic Republic of", "Iraq", "Ireland", "Isle of Man", "Israel", "Italy", "Jamaica", "Japan", "Jersey", "Jordan", "Kazakhstan", "Kenya", diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb index 3d45984b83..8f7db02f2d 100644 --- a/actionpack/test/template/form_options_helper_test.rb +++ b/actionpack/test/template/form_options_helper_test.rb @@ -491,7 +491,6 @@ class FormOptionsHelperTest < Test::Unit::TestCase <option value="Germany">Germany</option> <option value="Ghana">Ghana</option> <option value="Gibraltar">Gibraltar</option> -<option value="Great Britain">Great Britain</option> <option value="Greece">Greece</option> <option value="Greenland">Greenland</option> <option value="Grenada">Grenada</option> @@ -747,7 +746,6 @@ COUNTRIES <option value="Germany">Germany</option> <option value="Ghana">Ghana</option> <option value="Gibraltar">Gibraltar</option> -<option value="Great Britain">Great Britain</option> <option value="Greece">Greece</option> <option value="Greenland">Greenland</option> <option value="Grenada">Grenada</option> @@ -1003,7 +1001,6 @@ COUNTRIES <option value="Germany">Germany</option> <option value="Ghana">Ghana</option> <option value="Gibraltar">Gibraltar</option> -<option value="Great Britain">Great Britain</option> <option value="Greece">Greece</option> <option value="Greenland">Greenland</option> <option value="Grenada">Grenada</option> |