card-mod-account 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c86e418e23551b4e344d47073a5cea56789cab7a091d0ece4d6b7488bfe4fe
-  data.tar.gz: 1a18cfb82d88f0bcca51ec77b99237bbe4c5527db7bb527fbcaeff0d87338863
+  metadata.gz: b83f29edd97e19f1ffa148f41b57c67f5009f421cf3266c6bf811a56231a1984
+  data.tar.gz: 0baee78e9eef9589305298abc04aca8f8714dfbfe8781e21b83f752fd9f74cae
 SHA512:
-  metadata.gz: c7103bb8aea180221f488ed16dfce14862f7d4d7228110177a9d9b0423144220c383c1c4ec7b1651f07f997b5440cf49c5378cc377df8497ba6240ca38c44548
-  data.tar.gz: 04bc2d61a8f17c24f2d6d1aa06eb7aa978afd78a70593007e27a25bfeb247e869f43f4bccd46d203ebbe93cfa08f2377864bdb7bb2c04e285e2a30a08bd32d9c
+  metadata.gz: f1782318b47b6e0d66830c9420e9116b3fd6bade7d3bc1366df2c8072dc87a0ce89048303afa0828ed4912f6a79676621d512ffde2f3e9e3231e9902e8144a9c
+  data.tar.gz: 5e2efc3bdec486d61f0ac557adc0cd9bc8ca5eb6db0f905e49a8f98d0dad61a8c68f10bd58ee7888a3a80dc235872b327794bbf0ac6ff69c6ff8eb8a83a24a4d

data/set/self/signin.rb

@@ -47,10 +47,6 @@ def recaptcha_on?
   false
 end
 
-def i18n_signin key
-  I18n.t key, scope: "mod.card-mod-account.set.self.signin"
-end
-
 def authenticate_or_abort email, pword
   abort_unless email, :email_missing
   abort_unless pword, :password_missing
@@ -69,19 +65,19 @@ def failed_signin email
 end
 
 def abort_unless value, error_key
-  abort :failure, i18n_signin(error_key) unless value
+  abort :failure, tr(error_key) unless value
 end
 
 def signin_error_message account
   case
-  when account.nil?     then i18n_signin(:error_unknown_email)
-  when !account.active? then i18n_signin(:error_not_active)
-  else                       i18n_signin(:error_wrong_password)
+  when account.nil?     then tr :error_unknown_email
+  when !account.active? then tr :error_not_active
+  else                       tr :error_wrong_password
   end
 end
 
 def error_on field, error_key
-  errors.add field, i18n_signin(error_key)
+  errors.add field, tr(error_key)
 end
 
 def account_for email
@@ -135,7 +131,7 @@ format :html do
 
   # FIXME: need a generic solution for this
   view :title do
-    voo.title ||= I18n.t(:sign_in_title, scope: "mod.card-mod-account.set.self.signin")
+    voo.title ||= tr :sign_in_title
     super()
   end
 
@@ -150,7 +146,7 @@ format :html do
 
   view :reset_password_success do
     # 'Check your email for a link to reset your password'
-    frame { I18n.t(:check_email, scope: "mod.card-mod-account.set.self.signin") }
+    frame { tr :check_email }
   end
 
   view :signin_buttons do
@@ -166,14 +162,14 @@ format :html do
   end
 
   def reset_password_voo
-    voo.title ||= card.i18n_signin(:forgot_password)
+    voo.title ||= tr :forgot_password
     voo.edit_structure = [signin_field(:email)]
     voo.hide :help
   end
 
   view :edit_buttons do
-    text = I18n.t :reset_my_password, scope: "mod.card-mod-account.set.self.signin"
-    button_tag text, situation: "primary", class: "_close-modal-on-success"
+    button_tag tr(:reset_my_password),
+               situation: "primary", class: "_close-modal-on-success"
   end
 
   def signin_success
@@ -181,18 +177,15 @@ format :html do
   end
 
   def signin_button
-    text = I18n.t :sign_in, scope: "mod.card-mod-account.set.self.signin"
-    button_tag text, situation: "primary"
+    button_tag tr(:sign_in), situation: "primary"
   end
 
   def signup_link
-    text = I18n.t :or_sign_up, scope: "mod.card-mod-account.set.self.signin"
-    subformat(Card[:account_links]).render! :sign_up, title: text
+    subformat(Card[:account_links]).render! :sign_up, title: tr(:or_sign_up)
   end
 
   def reset_password_link
-    text = I18n.t :reset_password, scope: "mod.card-mod-account.set.self.signin"
-    link = link_to_view :edit, text, path: { slot: { hide: :bridge_link } }
+    link = link_to_view :edit, tr(:reset_password), path: { slot: { hide: :bridge_link } }
     # FIXME: inline styling
     raw("<div style='float:right'>#{link}</div>")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-account
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.2
 - !ruby/object:Gem::Dependency
   name: card-mod-email
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
 description: ''
 email:
 - info@decko.org
@@ -97,10 +97,15 @@ files:
 - set/type/user.rb
 - set/type/user/setup_help.haml
 - set/type_plus_right/user/email.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: account
 post_install_message:
 rdoc_options: []