enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/config/locales/devise.ja.yml

@@ -1,55 +1,58 @@
 ja:
   devise:
-    failure:
-      already_authenticated: 'すでにログインしています。'
-      unauthenticated: '操作を続けるにはログインが必要です。'
-      unconfirmed: '操作を続けるにはアカウントの確認が必要です。'
-      locked: 'アカウントは停止されています。'
-      not_found_in_database: 'ユーザ名かパスワードが正しくありません。'
-      invalid: 'ユーザ名かパスワードが正しくありません。'
-      invalid_token: 'Invalid authentication token.'
-      timeout: 'Your session expired, please sign in again to continue.'
-      inactive: 'アカウントが有効になっていません。'
-    sessions:
-      signed_in: 'ログインしました。'
-      signed_out: 'ログアウトしました。'
-    passwords:
-      send_instructions: 'パスワードを再設定する手順についてのメールが数分のうちに届きます。'
-      updated: 'パスワードは正しく更新されました。ログインしました。'
-      updated_not_active: 'パスワードは正しく更新されました。'
-      send_paranoid_instructions: "データベース上にあなたの電子メールが見つかりましたら、パスワード再発行のためのリンクをお送りします。"
     confirmations:
-      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
-      send_paranoid_instructions: 'データベース上にあなたの電子メールが見つかりましたら、アカウント確認のためのリンクをお送りします。'
-      confirmed: 'Your account was successfully confirmed. You are now signed in.'
-    registrations:
-      signed_up: 'Welcome! You have signed up successfully.'
-      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
-      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
-      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
-      updated: 'You updated your account successfully.'
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
-      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
-    unlocks:
-      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
-      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
-      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
-    omniauth_callbacks:
-      success: 'Successfully authorized from %{kind} account.'
-      failure: 'Could not authorize you from %{kind} because "%{reason}".'
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_paranoid_instructions: "データベース上にあなたの電子メールが見つかりましたら、アカウント確認のためのリンクをお送りします。"
+    failure:
+      already_authenticated: "すでにログインしています。"
+      inactive: "アカウントが有効になっていません。"
+      invalid: "ユーザ名かパスワードが正しくありません。"
+      locked: "アカウントは停止されています。"
+      last_attempt: "アカウントがロックされる前に一度以上ログインを試行しました。"
+      not_found_in_database: "ユーザ名かパスワードが正しくありません。"
+      timeout: "セッションが切れました。続行するにはもう一度ログインしてください。"
+      unauthenticated: "操作を続けるにはログインが必要です。"
+      unconfirmed: "操作を続けるにはアカウントの確認が必要です。"
     mailer:
       confirmation_instructions:
-        subject: 'Confirmation instructions'
+        subject: "Confirmation instructions"
       reset_password_instructions:
-        subject: 'Reset password instructions'
+        subject: "Reset password instructions"
       unlock_instructions:
-        subject: 'Unlock Instructions'
+        subject: "Unlock instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "パスワードを再設定する手順についてのメールが数分のうちに届きます。"
+      send_paranoid_instructions: "データベース上にあなたの電子メールが見つかりましたら、パスワード再発行のためのリンクをお送りします。"
+      updated: "パスワードは正しく更新されました。ログインしました。"
+      updated_not_active: "パスワードは正しく更新されました。"
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "ログインしました。"
+      signed_out: "ログアウトしました。"
+      already_signed_out: "ログアウトしました。"
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
   errors:
     messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
       expired: "有効期限が切れています。新しく登録してください。"
       not_found: "not found"
-      already_confirmed: "was already confirmed, please try signing in"
       not_locked: "was not locked"
       not_saved:
-        one: "%{resource} を保存するときに1つのエラーが発生しました:"
-        other: "%{resource} を保存するときに%{count}つのエラーが発生しました:"
+        one: "%{resource} を保存するときに1個のエラーが発生しました:"
+        other: "%{resource} を保存するときに%{count}個のエラーが発生しました:"

data/config/locales/en.yml

@@ -0,0 +1,214 @@
+en:
+  date:
+    abbr_day_names:
+    - Sun
+    - Mon
+    - Tue
+    - Wed
+    - Thu
+    - Fri
+    - Sat
+    abbr_month_names:
+    -
+    - Jan
+    - Feb
+    - Mar
+    - Apr
+    - May
+    - Jun
+    - Jul
+    - Aug
+    - Sep
+    - Oct
+    - Nov
+    - Dec
+    day_names:
+    - Sunday
+    - Monday
+    - Tuesday
+    - Wednesday
+    - Thursday
+    - Friday
+    - Saturday
+    formats:
+      default: ! '%Y-%m-%d'
+      long: ! '%B %d, %Y'
+      short: ! '%b %d'
+    month_names:
+    -
+    - January
+    - February
+    - March
+    - April
+    - May
+    - June
+    - July
+    - August
+    - September
+    - October
+    - November
+    - December
+    order:
+    - :year
+    - :month
+    - :day
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: about 1 hour
+        other: about %{count} hours
+      about_x_months:
+        one: about 1 month
+        other: about %{count} months
+      about_x_years:
+        one: about 1 year
+        other: about %{count} years
+      almost_x_years:
+        one: almost 1 year
+        other: almost %{count} years
+      half_a_minute: half a minute
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
+      less_than_x_seconds:
+        one: less than 1 second
+        other: less than %{count} seconds
+      over_x_years:
+        one: over 1 year
+        other: over %{count} years
+      x_days:
+        one: 1 day
+        other: ! '%{count} days'
+      x_minutes:
+        one: 1 minute
+        other: ! '%{count} minutes'
+      x_months:
+        one: 1 month
+        other: ! '%{count} months'
+      x_seconds:
+        one: 1 second
+        other: ! '%{count} seconds'
+    prompts:
+      day: Day
+      hour: Hour
+      minute: Minute
+      month: Month
+      second: Seconds
+      year: Year
+  errors: &errors
+    format: ! '%{attribute} %{message}'
+    messages:
+      accepted: must be accepted
+      blank: can't be blank
+      present: must be blank
+      confirmation: ! "doesn't match %{attribute}"
+      empty: can't be empty
+      equal_to: must be equal to %{count}
+      even: must be even
+      exclusion: is reserved
+      greater_than: must be greater than %{count}
+      greater_than_or_equal_to: must be greater than or equal to %{count}
+      inclusion: is not included in the list
+      invalid: is invalid
+      less_than: must be less than %{count}
+      less_than_or_equal_to: must be less than or equal to %{count}
+      not_a_number: is not a number
+      not_an_integer: must be an integer
+      odd: must be odd
+      record_invalid: ! 'Validation failed: %{errors}'
+      restrict_dependent_destroy:
+        one: "Cannot delete record because a dependent %{record} exists"
+        many: "Cannot delete record because dependent %{record} exist"
+      taken: has already been taken
+      too_long:
+        one: is too long (maximum is 1 character)
+        other: is too long (maximum is %{count} characters)
+      too_short:
+        one: is too short (minimum is 1 character)
+        other: is too short (minimum is %{count} characters)
+      wrong_length:
+        one: is the wrong length (should be 1 character)
+        other: is the wrong length (should be %{count} characters)
+      other_than: "must be other than %{count}"
+    template:
+      body: ! 'There were problems with the following fields:'
+      header:
+        one: 1 error prohibited this %{model} from being saved
+        other: ! '%{count} errors prohibited this %{model} from being saved'
+  helpers:
+    select:
+      prompt: Please select
+    submit:
+      create: Create %{model}
+      submit: Save %{model}
+      update: Update %{model}
+  number:
+    currency:
+      format:
+        delimiter: ! ','
+        format: ! '%u%n'
+        precision: 2
+        separator: .
+        significant: false
+        strip_insignificant_zeros: false
+        unit: $
+    format:
+      delimiter: ! ','
+      precision: 3
+      separator: .
+      significant: false
+      strip_insignificant_zeros: false
+    human:
+      decimal_units:
+        format: ! '%n %u'
+        units:
+          billion: Billion
+          million: Million
+          quadrillion: Quadrillion
+          thousand: Thousand
+          trillion: Trillion
+          unit: ''
+      format:
+        delimiter: ''
+        precision: 3
+        significant: true
+        strip_insignificant_zeros: true
+      storage_units:
+        format: ! '%n %u'
+        units:
+          byte:
+            one: Byte
+            other: Bytes
+          gb: GB
+          kb: KB
+          mb: MB
+          tb: TB
+    percentage:
+      format:
+        delimiter: ''
+        format: "%n%"
+    precision:
+      format:
+        delimiter: ''
+  support:
+    array:
+      last_word_connector: ! ', and '
+      two_words_connector: ! ' and '
+      words_connector: ! ', '
+  time:
+    am: am
+    formats:
+      default: ! '%a, %d %b %Y %H:%M:%S %z'
+      long: ! '%B %d, %Y %H:%M'
+      short: ! '%d %b %H:%M'
+      only_date: "%B %d, %Y"
+      only_year_and_month: "%m, %Y"
+      only_month: "%m"
+    pm: pm
+  # remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
+  activemodel:
+    errors:
+      <<: *errors
+  activerecord:
+    errors:
+      <<: *errors

data/config/locales/ja.yml

@@ -9,7 +9,7 @@ ja:
     - 金
     - 土
     abbr_month_names:
-    - 
+    -
     - 1月
     - 2月
     - 3月
@@ -35,7 +35,7 @@ ja:
       long: ! '%Y年%m月%d日(%a)'
       short: ! '%m/%d'
     month_names:
-    - 
+    -
     - 1月
     - 2月
     - 3月
@@ -69,10 +69,10 @@ ja:
       half_a_minute: 30秒前後
       less_than_x_minutes:
         one: 1分以内
-        other: ! '%{count}分以内'
+        other: ! '%{count}分未満'
       less_than_x_seconds:
         one: 1秒以内
-        other: ! '%{count}秒以内'
+        other: ! '%{count}秒未満'
       over_x_years:
         one: 1年以上
         other: ! '%{count}年以上'
@@ -100,7 +100,8 @@ ja:
     messages:
       accepted: を受諾してください。
       blank: を入力してください。
-      confirmation: と確認の入力が一致しません。
+      present: は入力しないでください。
+      confirmation: と%{attribute}の入力が一致しません。
       empty: を入力してください。
       equal_to: は%{count}にしてください。
       even: は偶数にしてください。
@@ -115,15 +116,17 @@ ja:
       not_an_integer: は整数で入力してください。
       odd: は奇数にしてください。
       record_invalid: バリデーションに失敗しました。 %{errors}
+      restrict_dependent_destroy: ! '%{record}が存在しているので削除できません。'
       taken: はすでに存在します。
       too_long: は%{count}文字以内で入力してください。
       too_short: は%{count}文字以上で入力してください。
       wrong_length: は%{count}文字で入力してください。
+      other_than: "は%{count}以外の値にしてください。"
     template:
       body: 次の項目を確認してください。
       header:
         one: ! '%{model}にエラーが発生しました。'
-        other: ! '%{model}に%{count}つのエラーが発生しました。'
+        other: ! '%{model}に%{count}個のエラーが発生しました。'
   helpers:
     select:
       prompt: 選択してください。
@@ -173,6 +176,7 @@ ja:
     percentage:
       format:
         delimiter: ''
+        format: "%n%"
     precision:
       format:
         delimiter: ''

data/config/locales/translation_en.yml

@@ -7,6 +7,8 @@ en:
       user_has_role: User and roles
       user_import_file: User import file
       user_import_result: User import result
+      profile: Profile
+      user_export_file: User export
 
     attributes:
       user:
@@ -23,16 +25,12 @@ en:
         remember_token_expires_at: Remember token expires at
         activation_code: Activation code
         activated_at: Activated at
-        expired_at: Expired at
         locked: Locked
         confirmed: Confirmed
         approved: Approved
-        checkout_icalendar_token: Checkout iCalendar token
         due_date_reminder_days: Due date reminder days
         note: Note
-        save_checkout_history: Save checkout history
         lock_version: Lock version
-        keyword_list: Keyword list
         user_number: User number
         state: State
         agent: Agent
@@ -43,6 +41,7 @@ en:
         current_password: Current password
         locale: Locale
         password_confirmation: Password confirmation
+        auto_generated_password: Set auto-generated password
       role:
         name: Name
         display_name: Display name
@@ -71,8 +70,26 @@ en:
         edit_mode: Edit mode
         error_message: Error message
         user_encoding: Encoding
+        default_user_group_id: Default user group
+        default_library_id: Default library
       user_import_result:
         body: Body
+      user_export_file:
+        user_export_file_name: Filename
+        user_export_file_size: Size
+        state: State
+      profile:
+        note: Note
+        keyword_list: Keyword list
+        required_role_id: Required role
+        user_id: User
+        user: User
+        user_group_id: User group
+        library_id: Library
+        locale: Locale
+        full_name: Full name
+        user_number: User number
+        expired_at: Expired at
 
   page:
     user_title: "Welcome %{login_name}"
@@ -184,6 +201,7 @@ en:
     number_of_pages: "Number of pages"
     holding_library: "Holding library"
     resource: "Resource"
+    manifestation_and_item: "Manifestation and Item"
     type: "Type"
     search_result_feed: "Search result feed"
     force_reload: "Force reload"
@@ -258,11 +276,12 @@ en:
     standard_view: "Standard view"
     mobile_view: "Mobile view"
     rearrange_order: "Rearrange order"
-    only_lowercase_letters_and_numbers_are_allowed: "Only lowercase letters and numbers are allowed. The first character must be alphabetic."
+    only_lowercase_letters_and_numbers_are_allowed: "is invalid. Only lowercase letters, numbers and underscore are allowed. The first character must be alphabetic."
     not_logged_in: "Not logged in"
     add_child: "Add a child"
     electronic_resource_management: "Electronic resource management"
     system: System
+    manual: Manual
   title:
     index: "index"
     show: "show"
@@ -367,6 +386,12 @@ en:
       one: "Resource will be impored in a %{minute} minute."
       other: "Resource will be impored in %{minute} minutes."
     auto_detect: "Auto detect"
+    successfully_created: "%{model} was created successfully. When the task is completed, its status on the list will be updated to 'completed'."
+    following_column_were_ignored: "The follwing column(s) were ignored: %{column}"
+  export:
+    export_completed: Export completed.
+    are_you_sure_to_export: It may take some time to complete. Are you sure to export?
+    successfully_created: "%{model} task was created successfully. A notification message will be sent to you when the task is completed. You can download the export file from 'Listing %{model}'."
   user:
     current_password: "Current password"
     new_password: "New password"
@@ -401,6 +426,7 @@ en:
     change_my_password: "Change my password"
     management: "User management"
     not_found: "User not found."
+    role_is_not_set: "Role is not set."
   subscribe:
     this_subscription_is_expired: "This subscription is expired!"
   role:
@@ -436,3 +462,6 @@ en:
     already_accepted: "This item is already accepted."
     accept: "Accept!"
     successfully_accepted: "This items was successfully accepted."
+  user_import_file:
+    default_user_group: If "user_group" column is not set in the TSV file, this user group is set to the new user.
+    default_library: If "library" column is not set in the TSV file, this library is set to the new user.

data/config/locales/translation_ja.yml

@@ -1,12 +1,14 @@
 ja:
   activerecord:
     models:
-      user: 利用者
+      user: 利用者アカウント
       role: 権限
       user_group: 利用者グループ
       user_has_role: 利用者と権限
       user_import_file: 利用者のインポート用ファイル
       user_import_result: 利用者インポートの結果
+      profile: 利用者
+      user_export_file: 利用者情報のエクスポート
 
     attributes:
       user:
@@ -23,16 +25,12 @@ ja:
         remember_token_expires_at: トークンを忘れないで期限が切れる
         activation_code: 活性化コード
         activated_at: 登録時刻
-        expired_at: 有効期限
         locked: 利用不可
         confirmed: 確認済み
         approved: 承認済み
-        checkout_icalendar_token: 貸出iCalendarのトークン
         due_date_reminder_days: Duedateリマインダー日
         note: 注記
-        save_checkout_history: 貸出の履歴を保存する
         lock_version: ロックバージョン
-        keyword_list: キーワードリスト
         user_number: 利用者番号
         state: 状態
         agent: 人物・団体
@@ -43,6 +41,7 @@ ja:
         current_password: 現在のパスワード
         locale: 言語
         password_confirmation: パスワード（確認）
+        auto_generated_password: パスワードの自動生成
       role:
         name: 名前
         display_name: 表示名
@@ -71,8 +70,26 @@ ja:
         edit_mode: 編集モード
         error_message: エラーメッセージ
         user_encoding: 文字コード
+        default_user_group_id: 既定の利用者グループ
+        default_library_id: 既定の図書館
       user_import_result:
         body: 本文
+      user_export_file:
+        user_export_file_name: ファイル名
+        user_export_file_size: ファイルサイズ
+        state: 状態
+      profile:
+        note: 注記
+        keyword_list: キーワードリスト
+        required_role_id: 閲覧に必要な権限
+        user_id: 利用者
+        user: 利用者
+        user_group_id: 利用者グループ
+        library_id: 所属館
+        locale: 言語
+        full_name: フルネーム
+        user_number: 利用者番号
+        expired_at: 有効期限
 
   page:
     user_title: "ようこそ %{login_name} さん"
@@ -172,6 +189,7 @@ ja:
     number_of_pages: "ページ数"
     holding_library: "所蔵館"
     resource: "資料"
+    manifestation_and_item: "書誌と所蔵"
     type: "種類"
     search_result_feed: "検索結果のフィード"
     force_reload: "強制的に再読込を行う"
@@ -242,11 +260,12 @@ ja:
     standard_view: "パソコン用の画面"
     mobile_view: "携帯機器用の画面"
     rearrange_order: "順番を変更する"
-    only_lowercase_letters_and_numbers_are_allowed: "英数小文字のみ使用できます。最初の文字に数字は使用できません。"
+    only_lowercase_letters_and_numbers_are_allowed: "には英数小文字・アンダースコアのみ使用できます。最初の文字に数字は使用できません。"
     not_logged_in: "ログインしていません"
     add_child: "子を追加"
     electronic_resource_management: 電子リソース管理
     system: システム
+    manual: マニュアル
   title:
     index: "一覧"
     show: "表示"
@@ -348,6 +367,12 @@ ja:
     from_isbn: "ISBNから"
     will_be_imported: "%{minute} 分以内にインポートされます。"
     auto_detect: "自動判別"
+    successfully_created: "%{model}は正常に作成されました。インポートが完了すると「%{model}の一覧」の状態が「完了」となります。"
+    following_column_were_ignored: "次の列は無視されました。 %{column}"
+  export:
+    export_completed: エクスポートが完了しました。
+    are_you_sure_to_export: エクスポートに時間がかかることがあります。本当にエクスポートしますか？
+    successfully_created: "%{model}の処理は正常に作成されました。エクスポートが完了しましたら、メッセージでお知らせします。エクスポートしたファイルは「%{model}の一覧」からダウンロードできます。"
   user:
     current_password: "現在のパスワード"
     new_password: "新しいパスワード"
@@ -382,6 +407,7 @@ ja:
     change_my_password: "パスワードを変更する"
     management: "利用者の管理"
     not_found: "利用者が見つかりません。"
+    role_is_not_set: "権限が設定されていません。"
   subscribe:
     this_subscription_is_expired: "購読期間が過ぎています。"
   role:
@@ -417,3 +443,6 @@ ja:
     already_accepted: "この資料はすでに検収されています。"
     accept: "検収"
     successfully_accepted: "この資料は正常に検収されました。"
+  user_import_file:
+    default_user_group: TSVファイルで"user_group"列が指定されていない場合、この利用者グループが登録されます。
+    default_library: TSVファイルで"library"列が指定されていない場合、この図書館が登録されます。

data/config/routes.rb

@@ -3,6 +3,10 @@ Rails.application.routes.draw do
     mount Resque::Server.new, :at => "/resque", :as => :resque
   end
 
+  resources :profiles
+
+  resources :user_export_files
+
   resources :user_import_results, :only => [:index, :show, :destroy]
 
   resources :user_import_files do
@@ -11,17 +15,10 @@ Rails.application.routes.draw do
 
   resource :my_account
 
-  #resources :users do
-  #  resource :patron
-  #end
-  resources :users
-
   resources :roles, :except => [:new, :create, :destroy]
 
   resources :user_groups
 
-  resources :local_patrons, :only => :show
-
   resources :accepts
 
   resources :baskets do

data/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -1,15 +1,8 @@
 class AddAdditionalAttributesToUser < ActiveRecord::Migration
   def change
     add_column :users, :username, :string
-    add_column :users, :user_number, :string
-    add_column :users, :locale, :string
     add_column :users, :deleted_at, :datetime
     add_column :users, :expired_at, :datetime
-    add_column :users, :library_id, :integer, :default => 1, :null => false
-    add_column :users, :required_role_id, :integer, :default => 1, :null => false
-    add_column :users, :user_group_id, :integer, :default => 1, :null => false
-    add_column :users, :note, :text
-    add_column :users, :keyword_list, :text
 
     add_column :users, :failed_attempts, :integer, :default => 0
     add_column :users, :unlock_token, :string
@@ -18,8 +11,6 @@ class AddAdditionalAttributesToUser < ActiveRecord::Migration
     add_column :users, :confirmed_at, :datetime
 
     add_index :users, :username, :unique => true
-    add_index :users, :user_group_id
-    add_index :users, :user_number, :unique => true
     add_index :users, :unlock_token,         :unique => true
   end
 end

data/db/migrate/20140122054321_create_profiles.rb

@@ -15,6 +15,6 @@ class CreateProfiles < ActiveRecord::Migration
     end
 
     add_index :profiles, :user_id
-    add_index :profiles, :user_number
+    add_index :profiles, :user_number, :unique => true
   end
 end

data/db/migrate/20140709113413_create_user_export_files.rb

@@ -0,0 +1,11 @@
+class CreateUserExportFiles < ActiveRecord::Migration
+  def change
+    create_table :user_export_files do |t|
+      t.integer :user_id
+      t.attachment :user_export
+      t.datetime :executed_at
+
+      t.timestamps
+    end
+  end
+end