lib/twitter_cldr/shared/languages.rb in twitter_cldr-1.2.0 vs lib/twitter_cldr/shared/languages.rb in twitter_cldr-1.3.0

@@ -3,33 +3,35 @@
 # Copyright 2012 Twitter, Inc
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
   module Shared
-    class Languages
+    module Languages
+
       class << self
+
         def all
-          all_for(TwitterCldr::get_locale)
+          all_for(TwitterCldr.get_locale)
         end
 
         def all_for(code)
           get_resource(TwitterCldr.convert_locale(code.to_sym))[:languages]
         rescue
           {}
         end
 
         def from_code(code)
-          from_code_for_locale(code, TwitterCldr::get_locale)
+          from_code_for_locale(code, TwitterCldr.get_locale)
         end
 
-        def from_code_for_locale(code, locale = TwitterCldr::get_locale)
+        def from_code_for_locale(code, locale = TwitterCldr.get_locale)
           get_resource(TwitterCldr.convert_locale(locale.to_sym))[:languages][TwitterCldr.convert_locale(code.to_sym)]
         rescue
           nil
         end
 
-        def translate_language(language, source_locale = :en, dest_locale = TwitterCldr::get_locale)
+        def translate_language(language, source_locale = :en, dest_locale = TwitterCldr.get_locale)
           source_locale = TwitterCldr.convert_locale(source_locale.to_sym)
           lang_code = get_resource(source_locale)[:languages].select { |key, val| val.downcase == language.downcase }.flatten.first
 
           if lang_code
             dest_locale = TwitterCldr.convert_locale(dest_locale.to_sym)
@@ -43,11 +45,13 @@
 
         protected
 
         def get_resource(locale)
           locale = TwitterCldr.convert_locale(locale)
-          TwitterCldr.get_resource(locale, "languages")[locale]
+          TwitterCldr.get_locale_resource(locale, :languages)[locale]
         end
+
       end
+
     end
   end
 end
\ No newline at end of file