Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add country field in profiles table #396 #469

Merged
merged 12 commits into from Sep 19, 2016

using another gem

  • Loading branch information...
n3k00n3 committed Aug 1, 2016
commit 23bdd30351579aac7ac9d4db9aa99482e4170d7b
@@ -29,7 +29,7 @@ gem 'auto_html', github: 'dejan/auto_html'
gem 'postmark-rails', '>= 0.10.0'
gem 'simple_form', '~> 3.0.2'

gem 'language_list', '~> 1.1'
gem 'country_select'

gem 'globalize', '~> 4.0.2'

@@ -74,9 +74,16 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
countries (1.2.5)
currencies (~> 0.4.2)
i18n_data (~> 0.7.0)
country_select (2.5.2)
countries (~> 1.2.0)
sort_alphabetical (~> 1.0)
css_parser (1.2.6)
addressable
rdoc
currencies (0.4.2)
database_cleaner (1.2.0)
deadweight (0.2.2)
css_parser (~> 1.2.6)
@@ -227,6 +234,7 @@ GEM
hashie (3.4.2)
hike (1.2.3)
i18n (0.7.0)
i18n_data (0.7.0)
inflecto (0.0.2)
ipaddress (0.8.0)
jquery-rails (3.1.3)
@@ -239,7 +247,6 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.3)
language_list (1.1.0)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.4.1)
@@ -381,6 +388,8 @@ GEM
actionpack (~> 4.0)
activemodel (~> 4.0)
slop (3.6.0)
sort_alphabetical (1.0.2)
unicode_utils (>= 1.2.2)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -404,6 +413,7 @@ GEM
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicode_utils (1.4.0)
unicorn (4.9.0)
kgio (~> 2.6)
rack
@@ -428,6 +438,7 @@ DEPENDENCIES
capybara (~> 2.4.1)
carrierwave
coffee-rails (~> 4.0.1)
country_select
database_cleaner (~> 1.2.0)
deadweight
devise (~> 3.1.1)
@@ -443,7 +454,6 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails
kaminari
language_list (~> 1.1)
letter_opener
mini_magick (~> 3.5.0)
newrelic_rpm
@@ -6,6 +6,7 @@
<%= f.input :email, input_html: { class: "mb input--width-100" } %>
<%= f.input :twitter, placeholder: '@', input_html: { class: "mb input--width-100" } %>
<%= f.input :city, input_html: { class: "mb input--width-100" } %>
<%= f.country_select :country, label: t(:country, scope: 'activerecord.attributes.profile').html_safe %>
<%= f.input :languages, label: t(:languages, scope: 'activerecord.attributes.profile').html_safe, input_html: { class: "mb input--width-100" } %>
<%= f.input :website, placeholder: 'http://', input_html: { class: "mb input--width-100" } %>
<%= f.input :topic_list, label: t(:topic_list, scope: 'activerecord.attributes.profile').html_safe, input_html: { class: "mb input--width-100" } %>
@@ -0,0 +1,97 @@
en:
iso_639_1:
ab: "abkhazian"
af: "afrikaans"
ar: "arabic"
as: "assamese"
az: "azerbaijani"
be: "belarusian"
bg: "bulgarian"
bn: "bengali"
bo: "tibetan"
br: "breton"
bs: "bosnian"
ca: "catalan / valencian"
ce: "chechen"
co: "corsican"
cs: "czech"
cu: "church slavic"
cy: "welsh"
da: "danish"
de: "german"
el: "greek"
en: "english"
eo: "esperanto"
es: "spanish"
et: "estonian"
eu: "basque"
fa: "persian"
fi: "finnish"
fj: "fijian"
fo: "faroese"
fr: "french"
fy: "western frisian"
ga: "irish"
gd: "gaelic / scottish gaelic"
gl: "galician"
gv: "manx"
he: "hebrew"
hi: "hindi"
hr: "croatian"
ht: "haitian; haitian creole"
hu: "hungarian"
hy: "armenian"
id: "indonesian"
is: "icelandic"
it: "italian"
ja: "japanese"
jv: "javanese"
ka: "georgian"
kg: "kongo"
ko: "korean"
ku: "kurdish"
kw: "cornish"
ky: "kirghiz"
la: "latin"
lb: "luxembourgish; letzeburgesch"
li: "limburgan; limburger; limburgish"
ln: "lingala"
lt: "lithuanian"
lv: "latvian"
mg: "malagasy"
mk: "macedonian"
mn: "mongolian"
mo: "moldavian"
ms: "malay"
mt: "maltese"
my: "burmese"
nb: "norwegian (bokmål)"
ne: "nepali"
nl: "dutch"
nn: "norwegian (nynorsk)"
"no": "norwegian"
oc: "occitan (post 1500); provençal"
pl: "polish"
pt: "portuguese"
rm: "raeto-romance"
ro: "romanian"
ru: "russian"
sc: "sardinian"
se: "northern sami"
sk: "slovak"
sl: "slovenian"
so: "somali"
sq: "albanian"
sr: "serbian"
sv: "swedish"
sw: "swahili"
tk: "turkmen"
tr: "turkish"
ty: "tahitian"
uk: "ukrainian"
ur: "urdu"
uz: "uzbek"
"vi": "vietnamese"
vo: "volapuk"
yi: "yiddish"
zh: "chinese"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.