world-flags 0.3.5 → 0.3.6

data/README.md

@@ -356,6 +356,10 @@ $("li.flag").click(function() {
 });
 ```
 
+## TODO for version 1.0
+
+Suggestions welcome ;)
+
 ## Enjoy
 
 Copyright (2012) Kristian Mandrup

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/config/languages/locale_languages.en.json

@@ -1,253 +1,253 @@
 {
   "en": {
-    "ad": "Catalan",
-    "ae": "Arabic",
-    "af": "Afghan",
-    "ag": "Antigua and Barbuda",
-    "ai": "French",
-    "al": "Albanian",
-    "am": "Armenian",
-    "ao": "Portuguese",
+    "ad": "ad:Catalan",
+    "ae": "ar-ae:Arabic",
+    "af": "af:Afghan",
+    "ag": "en-ag:English",
+    "ai": "fr-ai:French",
+    "al": "al:Albanian",
+    "am": "am:Armenian",
+    "ao": "pt-ao:Portuguese",
     "aq": "None",
-    "ar": "Spanish",
-    "as": "Samoan",
-    "at": "Austrian",
-    "au": "English",
-    "aw": "English",
-    "ax": "English",
-    "az": "Dutch",
-    "ba": "Azerbaijani",
-    "bb": ["Bosnian", "Serbian", "Croatian"],
-    "bd": "English",
-    "be": "Bengali",
-    "bf": ["Dutch", "French", "German"],
-    "bg": "French",
-    "bh": "Bulgarian",
-    "bi": "Arabic",
-    "bj": ["Kirundi", "French"],
-    "bl": "French",
-    "bm": "English",
-    "bn": "Malay",
-    "bo": "Spanish",
-    "bq": "Dutch",
-    "br": "Portuguese",
-    "bs": "English",
-    "bt": "Dzongkha",
-    "bv": "Norwegian",
-    "bw": ["English", "Setswana"],
-    "by": ["Belarusian", "Russian"],
-    "bz": "French",
-    "ca": "English",
-    "cc": "English",
-    "cd": "French",
-    "cf": "French",
-    "cg": "French",
-    "ch": ["German", "French", "Italian"],
-    "ci": "French",
-    "ck": "English",
-    "cl": "Spanish",
-    "cm": ["French", "English"],
-    "cn": "Chinese",
-    "co": "Spanish",
-    "cr": "Spanish",
-    "cu": "Spanish",
-    "cv": "Portuguese",
-    "cw": ["Papiamentu", "Dutch"],
-    "cx": "English",
-    "cy": ["Greek", "Turkish"],
-    "cz": "Czech",
-    "de": "German",
-    "dj": ["French", "Arabic"],
-    "dk": "Danish",
-    "dm": "Spanish",
-    "do": "Spanish",
-    "dz": "French",
-    "ec": "Spanish",
-    "ee": "Estonian",
-    "eg": "Arabic",
-    "eh": "Arabic",
-    "er": ["Arabic", "English"],
-    "es": "Spanish",
-    "et": "Amharic",
-    "fi": ["Finnish", "Swedish"],
-    "fj": "English",
-    "fk": "English",
-    "fm": "English",
-    "fo": ["Faroese", "Danish"],
-    "fr": "French",
-    "ga": "French",
-    "gb": "English",
-    "gd": "English",
-    "ge": "English",
-    "gf": "French",
-    "gg": "English",
-    "gh": "English",
-    "gi": "English",
-    "gl": "Danish",
-    "gm": "English",
-    "gn": "French",
-    "gp": "French",
-    "gq": "French",
-    "gr": "Greek",
-    "gs": "Georgian",
-    "gt": "Spanish",
-    "gu": "French",
-    "gw": "French",
-    "gy": "English",
-    "hk": ["English", "Chinese"],
-    "hm": "English",
-    "hn": "Spanish",
-    "hr": "Croatian",
-    "ht": "French",
-    "hu": "Hungarian",
-    "id": ["Indonesian","Vietnamese"],
-    "ie": "Irish",
-    "il": ["Hebrew", "Arabic"],
-    "im": "English",
-    "in": ["Hindi", "English"],
-    "io": "English",
-    "iq": ["Arabic", "Kurdish"],
-    "ir": "Persian",
-    "is": "Icelandic",
-    "it": "Italian",
-    "je": "English",
-    "jm": "English",
-    "jo": "Jordanian",
-    "jp": "Japanese",
-    "ke": "English",
-    "kg": ["Kyrgyz", "Russian"],
-    "kh": "French",
-    "ki": ["English", "Gilbertese"],
-    "km": ["Comorian", "Arabic", "French"],
-    "kn": "English",
-    "kp": "Korean",
-    "kr": "Korean",
-    "kw": "Arabic",
-    "ky": "English",
-    "kz": ["Kazakh", "Russian"],
-    "la": "Lao",
-    "lb": "Arabic",
-    "lc": "English",
-    "li": "German",
-    "lk": ["Sinhala", "Tamil"],
-    "lr": "English",
-    "ls": ["Sesotho", "English"],
-    "lt": "Lithuanian",
-    "lu": ["Luxembourgish", "French", "German"],
-    "lv": "Latvian",
-    "ly": "Arabic",
-    "ma": ["Arabic", "Berber"],
-    "mc": "French",
-    "md": "Romanian",
-    "me": ["Serbian", "Bosnian", "Albanian", "Croatian"],
-    "mf": "French",
-    "mg": "French",
-    "mh": "English",
-    "mk": "Macedonian",
-    "ml": "French",
-    "mm": "Burmese",
-    "mn": "Mongolian",
-    "mo": "French",
-    "mp": "English",
-    "mq": "French",
-    "mr": "English",
-    "ms": "French",
-    "mt": "French",
-    "mu": "English",
-    "mv": "Dhivehi",
-    "mw": ["Chichewa", "English"],
-    "mx": "Spanish",
-    "my": "Malaysian",
-    "mz": "French",
-    "na": "English",
-    "nc": "French",
-    "ne": "French",
-    "nf": "English",
-    "ng": "English",
-    "ni": "Spanish",
-    "nl": "Dutch",
-    "no": "Norwegian",
-    "np": "Nepalese",
-    "nr": ["English", "Nauruan"],
-    "nu": ["Niuean", "English"],
-    "nz": "English",
-    "om": "Arabic",
-    "pa": "Spanish",
-    "pe": "Spanish",
-    "pf": "French",
-    "pg": "English",
-    "ph": "Filipino",
-    "pk": "Arabic",
-    "pl": "Polish",
-    "pm": "French",
-    "pn": "English",
-    "pr": "Spanish",
-    "ps": ["Arabic", "Hebrew", "English"],
-    "pt": "Portuguese",
-    "pw": ["Palaun", "English"],
-    "py": "Spanish",
-    "qa": "Arabic",
-    "re": "French",
-    "ro": "Romanian",
-    "rs": "Serbian",
-    "ru": "Russian",
-    "rw": "French",
-    "sa": "Arabic",
-    "sb": "English",
-    "sc": ["French", "English"],
-    "sd": "Arabic",
-    "se": "Swedish",
-    "sg": ["English", "Malay", "Chinese"],
-    "sh": "Spanish",
-    "si": "Slovenian",
-    "sj": "Norwegian",
-    "sk": "Slovakian",
-    "sl": "French",
-    "sm": "Italian",
-    "sn": "Senegalese",
-    "so": ["Somali", "Arabic"],
-    "sr": "French",
-    "ss": "French",
-    "st": "French",
-    "sv": "Spanish",
-    "sx": "Dutch",
-    "sy": "Arabic",
-    "sz": ["Swati", "English"],
-    "tc": "English",
-    "td": "French",
-    "tf": "French",
-    "tg": "French",
-    "th": "Thai",
-    "tj": ["Tajik", "Russian"],
-    "tk": ["Tokelauan", "English"],
-    "tl": ["Tetum", "Portuguese"],
-    "tm": ["Turkmen", "Russian"],
-    "tn": "French",
-    "to": "French",
-    "tr": "Turkish",
-    "tt": "French",
-    "tv": ["Tuvaluan", "English"],
-    "tw": ["Chinese", "Taiwanese"],
-    "tz": ["Swahili", "English"],
-    "ua": ["Ukrainian", "Russian"],
-    "ug": ["Swahili", "English"],
-    "um": "English",
-    "us": "English",
-    "uy": "Spanish",
-    "uz": ["Uzbek", "Russian"],
-    "va": ["Latin", "Italian"],
-    "vc": "French",
-    "ve": "Spanish",
-    "vg": "English",
-    "vi": "English",
-    "vn": "Vietnamese",
-    "vu": ["Bislama", "English", "French"],
-    "wf": "French",
-    "ws": ["Samoan", "English"],
-    "ye": "Arabic",
-    "yt": "French",
-    "za": ["Afrikaans", "English", "Ndebele", "Sotho", "Swazi", "Tswana", "Tsonga", "Venda", "Xhosa", "Zulu"],
-    "zm": "English",
-    "zw": ["English", "Shona", "Sindebele"]
+    "ar": "es-ar:Spanish",
+    "as": "as:Samoan",
+    "at": "au:Austrian",
+    "au": "en-au:English",
+    "aw": "en-aw:English",
+    "ax": "en-ax:English",
+    "az": "nl-az:Dutch",
+    "ba": "ba:Azerbaijani",
+    "bb": ["bo:Bosnian", "se:Serbian", "hr:Croatian"],
+    "bd": "en-bd:English",
+    "be": "be-be:Bengali",
+    "bf": ["nl-bf:Dutch", "fr-bf:French", "de-bf:German"],
+    "bg": "fr-bg:French",
+    "bh": "bu:Bulgarian",
+    "bi": "ar-bi:Arabic",
+    "bj": ["bj:Kirundi", "fr-bj:French"],
+    "bl": "fr-bl:French",
+    "bm": "en-bm:English",
+    "bn": "ma-bn:Malay",
+    "bo": "es-bo:Spanish",
+    "bq": "nl-bq:Dutch",
+    "br": "pt-br:Portuguese",
+    "bs": "en-bs:English",
+    "bt": "bt:Dzongkha",
+    "bv": "nb-bv:Norwegian",
+    "bw": ["en-bw:English", "bw:Setswana"],
+    "by": ["be:Belarusian", "ru-by:Russian"],
+    "bz": "fr-bz:French",
+    "ca": "en-ca:English",
+    "cc": "en-cc:English",
+    "cd": "fr-cd:French",
+    "cf": "fr-cf:French",
+    "cg": "fr-cg:French",
+    "ch": ["de-ch:German", "fr-ch:French", "it-ch:Italian"],
+    "ci": "fr-ci:French",
+    "ck": "en-ck:English",
+    "cl": "es-cl:Spanish",
+    "cm": ["fr-cm:French", "en-cm:English"],
+    "cn": "zh:Chinese",
+    "co": "es:Spanish",
+    "cr": "es-cr:Spanish",
+    "cu": "es-cu:Spanish",
+    "cv": "pt-cv:Portuguese",
+    "cw": ["cw:Papiamentu", "nl-cw:Dutch"],
+    "cx": "en-cx:English",
+    "cy": ["gr-cy:Greek", "tr-cy:Turkish"],
+    "cz": "cz:Czech",
+    "de": "de:German",
+    "dj": ["fr-dj:French", "ar-dj:Arabic"],
+    "dk": "da:Danish",
+    "dm": "es-dm:Spanish",
+    "do": "es-do:Spanish",
+    "dz": "fr-dz:French",
+    "ec": "es-ec:Spanish",
+    "ee": "ee:Estonian",
+    "eg": "ar-eg:Arabic",
+    "eh": "ar-eh:Arabic",
+    "er": ["ar-er:Arabic", "en-er:English"],
+    "es": "es:Spanish",
+    "et": "et:Amharic",
+    "fi": ["gi:Finnish", "sv-fi:Swedish"],
+    "fj": "en-fj:English",
+    "fk": "en-fk:English",
+    "fm": "en-fm:English",
+    "fo": ["fo:Faroese", "da-fo:Danish"],
+    "fr": "fr:French",
+    "ga": "fr-ga:French",
+    "gb": "en-gb:English",
+    "gd": "en-gd:English",
+    "ge": "en-ge:English",
+    "gf": "fr-gf:French",
+    "gg": "en-gg:English",
+    "gh": "en-gh:English",
+    "gi": "en-gi:English",
+    "gl": "da:Danish",
+    "gm": "en-gm:English",
+    "gn": "fr-gn:French",
+    "gp": "fr-gp:French",
+    "gq": "fr-gq:French",
+    "gr": "gr:Greek",
+    "gs": "ge:Georgian",
+    "gt": "es-gt:Spanish",
+    "gu": "fr-gu:French",
+    "gw": "fr-gw:French",
+    "gy": "en-gy:English",
+    "hk": ["en-hk:English", "zh-hk:Chinese"],
+    "hm": "en-hm:English",
+    "hn": "es-hn:Spanish",
+    "hr": "hr:Croatian",
+    "ht": "fr-ht:French",
+    "hu": "hu:Hungarian",
+    "id": ["id:Indonesian","vn-id:Vietnamese"],
+    "ie": "ie:Irish",
+    "il": ["il:Hebrew", "ar-il:Arabic"],
+    "im": "en-im:English",
+    "in": ["in:Hindi", "en-in:English"],
+    "io": "en:English",
+    "iq": ["ar-iq:Arabic", "tr:Kurdish"],
+    "ir": "ir:Persian",
+    "is": "is:Icelandic",
+    "it": "it:Italian",
+    "je": "en-je:English",
+    "jm": "en-jm:English",
+    "jo": "jo:Jordanian",
+    "jp": "jp:Japanese",
+    "ke": "en-ke:English",
+    "kg": ["kg:Kyrgyz", "ru-kg:Russian"],
+    "kh": "fr-kh:French",
+    "ki": ["en-ki:English", "ki:Gilbertese"],
+    "km": ["km:Comorian", "ar-km:Arabic", "fr-km:French"],
+    "kn": "en-kn:English",
+    "kp": "kp:Korean",
+    "kr": "kr:Korean",
+    "kw": "ar-kw:Arabic",
+    "ky": "en-ky:English",
+    "kz": ["kz:Kazakh", "ru-kz:Russian"],
+    "la": "la:Lao",
+    "lb": "ar-lb:Arabic",
+    "lc": "en-lc:English",
+    "li": "de-li:German",
+    "lk": ["lk:Sinhala", "Tamil"],
+    "lr": "en-lr:English",
+    "ls": ["ls:Sesotho", "en:English"],
+    "lt": "lt:Lithuanian",
+    "lu": ["lu:Luxembourgish", "fr-lu:French", "de-lu:German"],
+    "lv": "lv:Latvian",
+    "ly": "ar-ly:Arabic",
+    "ma": ["ar-ma:Arabic", "ma:Berber"],
+    "mc": "fr-mc:French",
+    "md": "ro-md:Romanian",
+    "me": ["se:Serbian", "bo:Bosnian", "al:Albanian", "hr:Croatian"],
+    "mf": "fr-mf:French",
+    "mg": "fr-mg:French",
+    "mh": "en-mh:English",
+    "mk": "mk:Macedonian",
+    "ml": "fr-ml:French",
+    "mm": "mm:Burmese",
+    "mn": "mn:Mongolian",
+    "mo": "fr-mo:French",
+    "mp": "en-mp:English",
+    "mq": "fr-mq:French",
+    "mr": "en-mr:English",
+    "ms": "fr-ms:French",
+    "mt": "fr-mt:French",
+    "mu": "en-mu:English",
+    "mv": "mv:Dhivehi",
+    "mw": ["mw:Chichewa", "en-mw:English"],
+    "mx": "es-mx:Spanish",
+    "my": "ma:Malaysian",
+    "mz": "fr-mz:French",
+    "na": "en-na:English",
+    "nc": "fr-nc:French",
+    "ne": "fr-ne:French",
+    "nf": "en-nf:English",
+    "ng": "en-ng:English",
+    "ni": "es-ni:Spanish",
+    "nl": "nl:Dutch",
+    "no": "nb:Norwegian",
+    "np": "np:Nepalese",
+    "nr": ["en:English", "nr:Nauruan"],
+    "nu": ["nu:Niuean", "en-nu:English"],
+    "nz": "en-nz:English",
+    "om": "ar-om:Arabic",
+    "pa": "es-pa:Spanish",
+    "pe": "es-pe:Spanish",
+    "pf": "fr-pf:French",
+    "pg": "en-pg:English",
+    "ph": "ph:Filipino",
+    "pk": "ar-pk:Arabic",
+    "pl": "pl:Polish",
+    "pm": "fr-pm:French",
+    "pn": "en-pn:English",
+    "pr": "es-pr:Spanish",
+    "ps": ["ar-ps:Arabic", "ps:Hebrew", "en-ps:English"],
+    "pt": "pt:Portuguese",
+    "pw": ["pw:Palaun", "en:English"],
+    "py": "es-py:Spanish",
+    "qa": "ar-qu:Arabic",
+    "re": "fr-re:French",
+    "ro": "ro:Romanian",
+    "rs": "se-rs:Serbian",
+    "ru": "ru:Russian",
+    "rw": "fr-rw:French",
+    "sa": "ar-sa:Arabic",
+    "sb": "en-sb:English",
+    "sc": ["fr-sc:French", "en-sc:English"],
+    "sd": "ar-sd:Arabic",
+    "se": "sv:Swedish",
+    "sg": ["en-sg:English", "ma-sg:Malay", "zh-sg:Chinese"],
+    "sh": "es-sh:Spanish",
+    "si": "si:Slovenian",
+    "sj": "nb:Norwegian",
+    "sk": "sk:Slovakian",
+    "sl": "fr-sl:French",
+    "sm": "it-sm:Italian",
+    "sn": "se:Senegalese",
+    "so": ["so:Somali", "ar-so:Arabic"],
+    "sr": "fr-sr:French",
+    "ss": "fr-ss:French",
+    "st": "fr-st:French",
+    "sv": "es-sv:Spanish",
+    "sx": "nl-sx:Dutch",
+    "sy": "ar-sy:Arabic",
+    "sz": ["sz:Swati", "en-sz:English"],
+    "tc": "en-tc:English",
+    "td": "fr-td:French",
+    "tf": "fr-tf:French",
+    "tg": "fr-tg:French",
+    "th": "th:Thai",
+    "tj": ["tj:Tajik", "ru-tj:Russian"],
+    "tk": ["tk:Tokelauan", "en-tk:English"],
+    "tl": ["tl:Tetum", "pt-tl:Portuguese"],
+    "tm": ["tm:Turkmen", "ru-tm:Russian"],
+    "tn": "fr-tn:French",
+    "to": "fr-to:French",
+    "tr": "tr:Turkish",
+    "tt": "fr-tt:French",
+    "tv": ["tv:Tuvaluan", "en-tv:English"],
+    "tw": ["zh:Chinese", "zh-tw:Taiwanese"],
+    "tz": ["tz:Swahili", "en:English"],
+    "ua": ["uk:Ukrainian", "ru-ua:Russian"],
+    "ug": ["ug:Swahili", "en-ug:English"],
+    "um": "en-um:English",
+    "us": "en-us:English",
+    "uy": "es-uy:Spanish",
+    "uz": ["uz:Uzbek", "ru-uz:Russian"],
+    "va": ["va:Latin", "it:Italian"],
+    "vc": "fr-vc:French",
+    "ve": "es-ve:Spanish",
+    "vg": "en-vg:English",
+    "vi": "en-vi:English",
+    "vn": "vn:Vietnamese",
+    "vu": ["vu:Bislama", "en-vu:English", "fr-vu:French"],
+    "wf": "fr-wf:French",
+    "ws": ["as:Samoan", "en-ws:English"],
+    "ye": "ar-ye:Arabic",
+    "yt": "fr-yt:French",
+    "za": ["af:Afrikaans", "za-en:English", "Ndebele", "Sotho", "Swazi", "Tswana", "Tsonga", "Venda", "Xhosa", "Zulu"],
+    "zm": "en:English",
+    "zw": ["en-zw:English", "Shona", "Sindebele"]
   }
 }

data/spec/world_flags/json/json_languages_spec.rb

@@ -22,6 +22,13 @@ describe WorldFlags::Helper::View do
     output = flags_list 32 do
       flags [:ar, :gb]
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"English\" data-locale=\"gb\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"es-ar:Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"en-gb:English\" data-locale=\"gb\">&nbsp;</li></ul>"
+  end
+
+  it "should list flags for Zaire with multiple language combis" do
+    output = flags_list 32 do
+      flags [:tw]
+    end
+    output.should == "<ul class=\"f32\"><li class=\"flag tw\" data-cc=\"tw\" data-country_name=\"United States\" data-language_name=\"zh:Chinese zh-tw:Taiwanese\" data-locale=\"tw\">&nbsp;</li></ul>"
   end
 end

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 240785203955185004
+      hash: -558446436876807119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: