mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
b6d9c17af1
commit
2eaa8e67c0
2 changed files with 1 additions and 5 deletions
|
@ -319,8 +319,7 @@ module ActionView
|
||||||
"Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt",
|
"Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt",
|
||||||
"El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)",
|
"El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)",
|
||||||
"Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia",
|
"Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia",
|
||||||
"French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar",
|
"French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea",
|
||||||
"Great Britain", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea",
|
|
||||||
"Guinea-Bissau", "Guyana", "Haiti", "Heard and McDonald Islands", "Holy See (Vatican City State)",
|
"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",
|
"Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Iran, Islamic Republic of", "Iraq",
|
||||||
"Ireland", "Isle of Man", "Israel", "Italy", "Jamaica", "Japan", "Jersey", "Jordan", "Kazakhstan", "Kenya",
|
"Ireland", "Isle of Man", "Israel", "Italy", "Jamaica", "Japan", "Jersey", "Jordan", "Kazakhstan", "Kenya",
|
||||||
|
|
|
@ -491,7 +491,6 @@ class FormOptionsHelperTest < Test::Unit::TestCase
|
||||||
<option value="Germany">Germany</option>
|
<option value="Germany">Germany</option>
|
||||||
<option value="Ghana">Ghana</option>
|
<option value="Ghana">Ghana</option>
|
||||||
<option value="Gibraltar">Gibraltar</option>
|
<option value="Gibraltar">Gibraltar</option>
|
||||||
<option value="Great Britain">Great Britain</option>
|
|
||||||
<option value="Greece">Greece</option>
|
<option value="Greece">Greece</option>
|
||||||
<option value="Greenland">Greenland</option>
|
<option value="Greenland">Greenland</option>
|
||||||
<option value="Grenada">Grenada</option>
|
<option value="Grenada">Grenada</option>
|
||||||
|
@ -747,7 +746,6 @@ COUNTRIES
|
||||||
<option value="Germany">Germany</option>
|
<option value="Germany">Germany</option>
|
||||||
<option value="Ghana">Ghana</option>
|
<option value="Ghana">Ghana</option>
|
||||||
<option value="Gibraltar">Gibraltar</option>
|
<option value="Gibraltar">Gibraltar</option>
|
||||||
<option value="Great Britain">Great Britain</option>
|
|
||||||
<option value="Greece">Greece</option>
|
<option value="Greece">Greece</option>
|
||||||
<option value="Greenland">Greenland</option>
|
<option value="Greenland">Greenland</option>
|
||||||
<option value="Grenada">Grenada</option>
|
<option value="Grenada">Grenada</option>
|
||||||
|
@ -1003,7 +1001,6 @@ COUNTRIES
|
||||||
<option value="Germany">Germany</option>
|
<option value="Germany">Germany</option>
|
||||||
<option value="Ghana">Ghana</option>
|
<option value="Ghana">Ghana</option>
|
||||||
<option value="Gibraltar">Gibraltar</option>
|
<option value="Gibraltar">Gibraltar</option>
|
||||||
<option value="Great Britain">Great Britain</option>
|
|
||||||
<option value="Greece">Greece</option>
|
<option value="Greece">Greece</option>
|
||||||
<option value="Greenland">Greenland</option>
|
<option value="Greenland">Greenland</option>
|
||||||
<option value="Grenada">Grenada</option>
|
<option value="Grenada">Grenada</option>
|
||||||
|
|
Loading…
Reference in a new issue