<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>db/migrate/002_extend_site_languages.rb</filename>
    </added>
    <added>
      <filename>vendor/plugins/globalize</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,15 +1,20 @@
 class SiteLanguage &lt; ActiveRecord::Base
+  
   class &lt;&lt; self
     def codes
       find(:all).collect { |sl| sl.code }
     end
 
     def default
-      'nl-BE'
+      'nl'
     end
   end
   
   def validate
     errors.add(&quot;code&quot;, &quot;has invalid format. Valid examples are 'nl-BE' and 'en-US'&quot;) unless RFC_3066.valid?(code)
   end
+  
+  def language
+    Locale.new(code).language
+  end
 end</diff>
      <filename>app/models/site_language.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,6 +3,12 @@
     %label.code Language Code
     = f.text_field :code
   %p
+    %label.domain Domain
+    = f.text_field :domain
+  %p
+    %label.checkbox Show in language navigation menu
+    = f.check_box :show_in_langnav
+  %p
     =submit_tag &quot;Save&quot; 
     or
     =link_to &quot;Cancel&quot;, site_languages_path
\ No newline at end of file</diff>
      <filename>app/views/site_languages/_form.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -4,12 +4,18 @@
   %thead
     %tr
       %th.language Language code
+      %th.lang_name Name
+      %th.domain Domain
       %th.modify Modify
   %tbody
     - @site_languages.each do |lang|
       %tr.node.level-1
         %td.language
           = link_to lang.code, edit_site_language_url(:id =&gt; lang)
+        %td.lang_name
+          = lang.language
+        %td.domain
+          = lang.domain
         %td.remove
           = link_to(image('remove', :alt =&gt; 'Remove language'), site_language_url(:id =&gt; lang), :method =&gt; :delete, :confirm =&gt; 'Are you sure you want to delete this language? All translations for it so far will be lost!') 
 </diff>
      <filename>app/views/site_languages/index.html.haml</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>vendor/plugins/globalize/LICENSE</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/README</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/data/country_data.csv</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/data/language_data.csv</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/data/translation_data.csv</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/generators/globalize/USAGE</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/generators/globalize/globalize_generator.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/generators/globalize/templates/migration.rb.gz</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/generators/globalize/templates/model_migration.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/generators/globalize/templates/tiny_migration.rb.gz</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/init.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/install.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/localization/core_ext.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/localization/core_ext_hooks.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/localization/db_translate.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/localization/db_view_translator.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/localization/locale.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/localization/rfc_3066.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/localization/supported_locales.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/models/country.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/models/currency.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/models/language.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/models/model_translation.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/models/translation.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/models/view_translation.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/rails/action_mailer.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/rails/action_view.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/rails/active_record.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/rails/active_record_helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/lib/globalize/rails/date_helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/populators/pop_dates.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/populators/pop_migration.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/populators/pop_pluralization.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/populators/pop_seps.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/tasks/data.rake</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/tasks/migration_tools.rake</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/action_mailer_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/action_mailer_test/globalize_mailer/test.en-US.plain.text.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/action_mailer_test/globalize_mailer/test.en.plain.text.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/action_mailer_test/globalize_mailer/test.he.plain.text.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/action_mailer_test/globalize_mailer/test.plain.text.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/config/database.yml.default</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/config/database.yml.example</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/core_ext_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/currency_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/date_helper_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/db/schema.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/db_localizes_translates_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/db_translation_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_categories.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_categories_products.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_countries.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_languages.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_manufacturers.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_products.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_simples.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_translations.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/fixtures/globalize_unlocalized_classes.yml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/locale_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/mime_responds_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/model_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/render_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/standard_data_test_helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/supported_locales_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/test_helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/test_standard_data.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/validation_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/view_picking_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/view_translation_namespace_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/view_translation_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/layouts/standard.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/render/test.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/all_types_with_layout.html.erb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/all_types_with_layout.js.rjs</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.html.en.erb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.html.erb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.html.fr.erb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.js.en.rjs</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.js.fr.rjs</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.js.rjs</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.xml.builder</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.xml.en.builder</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults.xml.fr.builder</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.html.en.erb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.html.erb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.html.fr.erb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.js.en.rjs</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.js.fr.rjs</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.js.rjs</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.xml.builder</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.xml.en.builder</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/respond_to/using_defaults_with_type_list.xml.fr.builder</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/test.he-IL.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/test.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/test2.he.rhtml</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/globalize/test/views/test2.rhtml</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>e17114356717025248854ab1a387553c32f36d89</id>
    </parent>
  </parents>
  <author>
    <name>Benny Degezelle</name>
    <email>benny@gorilla-webdesign.be</email>
  </author>
  <url>http://github.com/DefV/site_language/commit/fe27a9bd96221ee43ea542614700199bcf2d5c5a</url>
  <id>fe27a9bd96221ee43ea542614700199bcf2d5c5a</id>
  <committed-date>2009-02-18T08:37:21-08:00</committed-date>
  <authored-date>2008-08-02T05:34:04-07:00</authored-date>
  <message>extending site_language with domain and 'show in langnav' switch

Signed-off-by: Jan De Poorter &lt;jan@defv.be&gt;</message>
  <tree>02024b674922eff98d181e785e0f6707ccb60baf</tree>
  <committer>
    <name>Jan De Poorter</name>
    <email>jan@defv.be</email>
  </committer>
</commit>
