Merge branch 'master' of github.com:sferik/rails_admin

README.md

@@ -2,7 +2,7 @@
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
-[![Build Status](https://travis-ci.org/sferik/rails_admin.png)](http://travis-ci.org/sferik/rails_admin)
+[![Build Status](https://secure.travis-ci.org/sferik/rails_admin.png)](http://travis-ci.org/sferik/rails_admin)
 
 [![Click here to lend your support to: RailsAdmin and make a donation at www.pledgie.com !](https://www.pledgie.com/campaigns/15917.png?skin_name=chrome)](http://www.pledgie.com/campaigns/15917)
 
@@ -32,7 +32,7 @@ Supported ORMs:
 
 ## <a name="notices">Notices</a>
 
-`Virtual` Class is no more. :( 
+`Virtual` Class is no more. :(
 Just use `String` instead, or another type. There is a `virtual?` method on `Fields::Base`, that can be used to detect whereas field has properties.
 
 `:attr_accessible` is now taken into account: restricted fields are not editable anymore, and mass-assignement security isn't bypassed anymore. Be careful if you whitelist attributes, you'll need to whitelist association 'id' methods as well : `division_id`, `player_ids`, `commentable_type`, `commentable_id`, etc.
@@ -469,7 +469,7 @@ You can also configure it per model:
 
 By default, rows sorted by the field `id` in reverse order
 
-You can change default behavior with use two options: `sort_by` and `sort_reverse?`
+You can change default behavior with use two options: `sort_by` and `sort_reverse`
 
 **Default sorting - Configure globally**
 

config/locales/rails_admin.ja.yml

@@ -0,0 +1,105 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+ja:
+  home:
+    name: "ホーム"
+  admin:
+    dashboard:
+      pagename: "サイト管理"
+      name: "管理画面トップ"
+      model_name: "モデル名"
+      last_used: "最終アクセス日"
+      records: "レコード数"
+      modify: "修正"
+      add_new: "追加"
+      show: "表示"
+      ago: "前"
+      navigation: "ナビゲーション"
+    history:
+      name: "履歴"
+      page_name: "\"%{name}\"の更新履歴"
+      no_activity: "なし"
+    show:
+      show_in_app: "アプリで見る"
+      page_name: "この%{name}の詳細"
+      no_file_found: "ファイルが見つかりません"
+    credentials:
+      log_out: "ログアウト"
+    list:
+      edit_action: "編集"
+      delete_action: "削除"
+      select_action: "選択"
+      export_action: "表示中のものをエクスポート"
+      show_action: "表示"
+      export_selected: "選択中をエクスポート"
+      delete_selected: "選択中を削除"
+      add_new: "追加"
+      search: "検索"
+      select: "編集したい%{name}を選択"
+      show_all: "すべて表示"
+      add_filter: "絞り込み"
+    new:
+      basic_info: "基本情報"
+      required: "必須"
+      optional: "オプション"
+      one_char: "character"
+      many_chars: "文字以内"
+      chosen: "選択された%{name}"
+      select_choice: "クリックして選択"
+      chose_all: "すべて選択"
+      clear_all: "選択解除"
+      up: "上へ"
+      down: "下へ"
+      save: "保存"
+      save_and_add_another: "保存して次へ"
+      save_and_edit: "保存して編集"
+      cancel: "キャンセル"
+    delete:
+      all_of_the_following_related_items_will_be_deleted: "? 関連する子レコードも削除されるまたは辿れなくなる可能性があります。"
+      are_you_sure_you_want_to_delete_the_object: "この'%{model_name}'を本当に削除しますか 対象:"
+      confirmation: "削除する"
+      delete_confirmation: "本当に削除しますか?"
+      bulk_delete: "これらのデータを本当に削除しますか? 関連するこれコード模索所され殳旗どれなくなる可能性があります。"
+    export:
+      confirmation: "%{name}としてエクスポート"
+      select: "エクスポートするフィールドを選択してください"
+      fields_from: "%{name}のフィールド"
+      fields_from_associated: "関連する%{name}のフィールド"
+      display: "カラム:%{name} 型:%{type}"
+      options_for: "%{name}の出力オプション"
+      empty_value_for_associated_objects: "<empty>"
+      csv:
+        header_for_root_methods: "%{name}" # 'model' is available
+        header_for_association_methods: "%{name} [%{association}]"
+        encoding_to: "文字コード"
+        encoding_to_help: "空白の場合は%{name}になります"
+        skip_header: "ヘッダなし"
+        skip_header_help: "チェックすると出力にヘッダ行を含めません"
+        default_col_sep: ","
+        col_sep: "区切り文字"
+        col_sep_help: "空白の場合は'%{value}'区切りです" # value is default_col_sep
+    flash:
+      successful: "%{name}の%{action}に成功しました"
+      error: "%{name}の%{action}に失敗しました"
+      noaction: "操作を取り消しました"
+    actions:
+      create: "追加"
+      created: "追加"
+      update: "更新"
+      updated: "更新"
+      delete: "削除"
+      deleted: "削除"
+      export: "エクスポート"
+      exported: "エクスポート"
+    breadcrumbs:
+      delete: "削除"
+      history: "履歴"
+      show: "詳細"
+      edit: "編集"
+      export: "エクスポート"
+      bulk_destroy: "削除"
+      new: "追加"
+      model_history: "履歴"
+      list: "一覧"
+      dashboard: "管理画面トップ"

config/locales/rails_admin.nb.yml

@@ -16,10 +16,15 @@ nb:
       add_new: "Legge til ny"
       show: "Vise"
       ago: "siden"
+      navigation: "Navigasjon"
     history:
       name: "Historikk"
       page_name: "Historikk for %{name}"
       no_activity: "Ingen aktivitet"
+    show:
+      show_in_app: "Vis i app"
+      page_name: "Detaljer for %{name}"
+      no_file_found: "Fil ikke funnet"
     credentials:
       log_out: "Logg ut"
     list:
@@ -33,6 +38,7 @@ nb:
       search: "Søk"
       select: "Velg %{name} for redigering"
       show_all: "Vis alle"
+      add_filter: "Legg til filter"
     new:
       basic_info: "Grunnleggende info"
       required: "Påkrevd"
@@ -50,8 +56,10 @@ nb:
       save_and_edit: "Lagre og fortsett redigering"
       cancel: "Avbryt"
     delete:
-      flash_confirmation: "%{name} er nå slettet"
+      all_of_the_following_related_items_will_be_deleted: "? De følgende assosierte oppføringene kan bli slettet eller forlatt:"
+      are_you_sure_you_want_to_delete_the_object: "Er du sikker på at du vil slette denne %{model_name}"
       confirmation: "Ja, jeg er sikker"
+      delete_confirmation: "Bekreft sletting"
       bulk_delete: "The following objects will be deleted, which may delete or orphan some of their related dependencies:"
     export:
       confirmation: "Eksportér til %{name}"
@@ -84,3 +92,14 @@ nb:
       deleted: "slettet"
       export: "eksportere"
       exported: "eksportert"
+    breadcrumbs:
+      delete: "slette"
+      history: "historikk"
+      show: "vise"
+      edit: "redigere"
+      export: "eksportere"
+      bulk_destroy: "slette"
+      new: "ny"
+      model_history: "historikk"
+      list: "liste"
+      dashboard: "dashboard"

lib/generators/rails_admin/templates/drop.rb

@@ -1,4 +1,4 @@
-class DropAdminHistoriesTable < ActiveRecord::Migration
+class DropRailsAdminHistoriesTable < ActiveRecord::Migration
    def self.up
     drop_table :rails_admin_histories
   end

lib/generators/rails_admin/uninstall_generator.rb

@@ -12,7 +12,7 @@ class UninstallGenerator < Rails::Generators::Base
 
     def uninstall
       display "Why you leaving so soon? :("
-      migration_template 'drop.rb', 'db/migrate/drop_rails_admin_histories.rb'
+      migration_template 'drop.rb', 'db/migrate/drop_rails_admin_histories_table.rb'
       remove_file 'config/initializers/rails_admin.rb'
       remove_file 'config/initializers/rails_admin.rb.example'
       gsub_file "config/routes.rb", /mount RailsAdmin::Engine => \'\/.+\', :as => \'rails_admin\'/, ''

spec/generators/uninstall_generator_spec.rb

@@ -22,7 +22,7 @@
 
 
   it "creates migrations for droping histories table" do      
-    assert_migration 'db/migrate/drop_rails_admin_histories.rb'
+    assert_migration 'db/migrate/drop_rails_admin_histories_table.rb'
   end
 
   it "removes config file" do