Merge branch 'master' of git://github.com/resolve/refinerycms

resolve · Jan 12, 2011 · 1597354 · 1597354
2 parents ee40b0c + 6d4bb4f
commit 1597354
Show file tree

Hide file tree

Showing 50 changed files with 467 additions and 806 deletions.
diff --git a/.rspec b/.rspec
@@ -1,3 +1,2 @@
 --color
---format documentation
 --drb
diff --git a/Gemfile b/Gemfile
@@ -32,22 +32,6 @@ java = (RUBY_PLATFORM == 'java')
 gem 'refinerycms',              :path => '.'
 
 gem 'friendly_id',              :git => 'git://github.com/parndt/friendly_id', :branch => 'globalize3'
-gem 'globalize3',               :git => 'git://github.com/refinerycms/globalize3'
-
-# Specify additional Refinery CMS Engines here (all optional):
-gem 'refinerycms-generators',   '~> 0.9.9', :git => 'git://github.com/resolve/refinerycms-generators'
-# gem 'refinerycms-inquiries',    '~> 0.9.9.9'
-# gem 'refinerycms-news',         '~> 1.0'
-# gem 'refinerycms-portfolio',    '~> 0.9.9'
-# gem 'refinerycms-theming',      '~> 0.9.9'
-# gem 'refinerycms-search',       '~> 0.9.8'
-# gem 'refinerycms-blog',         '~> 1.1'
-
-# Add i18n support (optional, you can remove this if you really want to).
-gem 'routing-filter',           :git => 'git://github.com/refinerycms/routing-filter'
-gem 'refinerycms-i18n',         :git => 'git://github.com/resolve/refinerycms-i18n'
-
-gem 'jruby-openssl' if java
 
 group :development, :test do
   # RSpec
@@ -78,3 +62,22 @@ end
 # REFINERY CMS DEVELOPMENT ====================================================
 
 # END REFINERY CMS DEVELOPMENT =================================================
+
+# USER DEFINED
+
+# Specify additional Refinery CMS Engines here (all optional):
+gem 'refinerycms-generators',   '~> 0.9.9', :git => 'git://github.com/resolve/refinerycms-generators'
+# gem 'refinerycms-inquiries',    '~> 0.9.9.9'
+# gem 'refinerycms-news',         '~> 1.0'
+# gem 'refinerycms-portfolio',    '~> 0.9.9'
+# gem 'refinerycms-theming',      '~> 0.9.9'
+# gem 'refinerycms-search',       '~> 0.9.8'
+# gem 'refinerycms-blog',         '~> 1.1'
+
+# Add i18n support (optional, you can remove this if you really want to).
+gem 'routing-filter',           :git => 'git://github.com/refinerycms/routing-filter'
+gem 'refinerycms-i18n',         :git => 'git://github.com/resolve/refinerycms-i18n'
+
+gem 'jruby-openssl' if java
+
+# END USER DEFINED
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -27,14 +27,6 @@ GIT
     friendly_id (3.1.8)
       babosa (~> 0.2.0)
 
-GIT
-  remote: git://github.com/refinerycms/globalize3
-  revision: c2837785a93c0478704a7d7626fca960a1db5146
-  specs:
-    globalize3 (0.0.10)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-
 GIT
   remote: git://github.com/refinerycms/routing-filter
   revision: 94a072118410475b0e872b050dc731ef136f1180
@@ -63,9 +55,9 @@ PATH
       acts_as_indexed (~> 0.6.6)
       bundler (~> 1.0.5)
       devise (~> 1.1)
-      dragonfly (~> 0.8.1)
+      dragonfly (~> 0.8.2)
       friendly_id (~> 3.1.8)
-      globalize3
+      globalize3 (>= 0.1.0.beta)
       moretea-awesome_nested_set (= 1.4.3.1)
       rack-cache (~> 0.5.2)
       rails (~> 3.0.3)
@@ -133,7 +125,7 @@ GEM
       bcrypt-ruby (~> 2.1.2)
       warden (~> 1.0.2)
     diff-lcs (1.1.2)
-    dragonfly (0.8.1)
+    dragonfly (0.8.2)
       rack
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -142,6 +134,9 @@ GEM
       rake (>= 0.8.7)
     gherkin (2.3.3)
       json (~> 1.4.6)
+    globalize3 (0.1.0.beta)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
     i18n (0.5.0)
     json (1.4.6)
     launchy (0.3.7)
@@ -226,7 +221,6 @@ DEPENDENCIES
   factory_girl
   friendly_id!
   gherkin
-  globalize3!
   json_pure (= 1.4.6a)!
   launchy
   rack-test (~> 0.5.6)

diff --git a/authentication/app/mailers/user_mailer.rb b/authentication/app/mailers/user_mailer.rb
@@ -8,7 +8,7 @@ def reset_notification(user, request)
     domain = request.domain(RefinerySetting.find_or_set(:tld_length, 1))
 
     mail(:to => user.email,
-         :subject => I18n.translate('user_mailer.link_to_reset_your_password'),
+         :subject => t('subject', :scope => 'user_mailer.reset_notification'),
          :from => "\"#{RefinerySetting[:site_name]}\" <no-reply@#{domain}>")
   end
 

diff --git a/authentication/app/models/user.rb b/authentication/app/models/user.rb
@@ -1,5 +1,3 @@
-require 'digest/sha1'
-
 class User < ActiveRecord::Base
   has_and_belongs_to_many :roles
   has_many :plugins, :class_name => "UserPlugin", :order => "position ASC", :dependent => :destroy
@@ -15,6 +13,8 @@ class User < ActiveRecord::Base
   attr_accessor :login
   attr_accessible :email, :password, :password_confirmation, :remember_me, :username, :plugins, :login
 
+  validates :username, :presence => true, :uniqueness => true
+
   class << self
     # Find user by email or username.
     # https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-sign_in-using-their-username-or-email-address

diff --git a/authentication/app/views/admin/users/_form.html.erb b/authentication/app/views/admin/users/_form.html.erb
@@ -25,7 +25,7 @@
   </div>
   <div class='field plugin_access'>
     <span class='label_with_help'>
-      <%= f.label :plugin_access, nil, :class => "title_label" %>
+      <%= f.label :plugin_access, t('.plugin_access'), :class => "title_label" %>
       <%= link_to "(#{t('.enable_all')})", "", :id => "user_plugins_enable_all" %>
     </span>
     <ul id='plugins' class='checkboxes'>
@@ -52,7 +52,7 @@
   <% if current_user.has_role?(:superuser) and RefinerySetting.find_or_set(:superuser_can_assign_roles, false) %>
     <div class='field role_access'>
       <span class='label_with_help'>
-        <%= f.label :role_access, nil, :class => "title_label" %>
+        <%= f.label :role_access, t('.role_access'), :class => "title_label" %>
       </span>
       <ul id='roles' class='checkboxes'>
         <% @available_roles.each do |role|

diff --git a/authentication/app/views/passwords/edit.html.erb b/authentication/app/views/passwords/edit.html.erb
@@ -1,4 +1,4 @@
-<% content_for :header, t('pick_new_password_for', :email => 'Refinery', :scope => 'users.reset') %>
+<% content_for :header, t('pick_new_password_for', :scope => 'users.reset', :email => @user.email) %>
 
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= f.hidden_field :reset_password_token %>

diff --git a/authentication/app/views/passwords/new.html.erb b/authentication/app/views/passwords/new.html.erb
@@ -4,7 +4,7 @@
 
   <div class='field'>
     <%= f.text_field :email, :class => "larger widest",
-                     :placeholder => t('.email_address', :default => t('authlogic.attributes.user_session.email'), :scope => 'users.forgot') %>
+                     :placeholder => t('email_address', :scope => 'users.forgot') %>
   </div>
 
   <%= render :partial => "/shared/admin/form_actions",

diff --git a/authentication/app/views/registrations/forgot.html.erb b/authentication/app/views/registrations/forgot.html.erb
diff --git a/authentication/app/views/registrations/reset.html.erb b/authentication/app/views/registrations/reset.html.erb
diff --git a/authentication/app/views/user_mailer/reset_notification.html.erb b/authentication/app/views/user_mailer/reset_notification.html.erb
@@ -1,6 +1,6 @@
-Request to reset password received for <%= @user.username %>
+<%= t('reset_request_recieved_for', :scope => 'user_mailer.reset_notification', :username => @user.username) %>
 
-Visit this url to choose a new password:
+<%= t('visit_this_url', :scope => 'user_mailer.reset_notification') %>:
   <%= @url %>
 
-(Your password will remain the same if no action is taken)
+(<%= t('remain_same_if_no_action', :scope => 'user_mailer.reset_notification') %>)
diff --git a/authentication/config/locales/cs.yml b/authentication/config/locales/cs.yml
@@ -18,7 +18,6 @@ cs:
         email_user: Poslat uživateli email
         preview: (%{who}) přidán %{created_at}
   sessions:
-    login_successful: Úspěšně přihlášen/a
     new:
       hello_please_sign_in: Prosím přihlašte se
       sign_in: Přihlášení
@@ -42,25 +41,15 @@ cs:
       successful: Heslo bylo úspěšně resetováno pro '%{email}'
       pick_new_password_for: Zadejte nové heslo pro %{email}
       reset_password: Reset hesla
-      password_blank: Vyplňte pole odpovídajícími hesly.
   user_mailer:
-    link_to_reset_your_password: Odkaz pro reset hesla
-  authlogic:
-    error_messages:
-      login_blank: musí být zadáno
-      password_blank: musí být zadáno
-      login_invalid: jsou povoleny pouze písmena, číslice, mezery a znaky '.-_@'.
-      email_invalid: není platnou emailovou adresou.
-      no_authentication_details: Neposkytl/a jste žádné detaily pro autentifikaci.
+    reset_notification:
+      subject: Odkaz pro reset hesla
+  activerecord:
     models:
-      user_session: UserSession
+      user: uživatel
     attributes:
-      user_session:
+      user:
         login: Přihlásit
         email: Email
         password: Heslo
         remember_me: Zapamatovat heslo
-        incorrect: Omlouváme se, ale váš %{login_field} nebo heslo je neplatné.
-  activerecord:
-    models:
-      user: uživatel
diff --git a/authentication/config/locales/da.yml b/authentication/config/locales/da.yml
@@ -1,49 +1,32 @@
 da:
-  devise:
-    sessions:
-      new:
-        sign_in: Log ind
   plugins:
     refinery_users:
       title: Brugere
   admin:
     users:
+      delete: Slet bruger
+      edit: Redigér bruger
       update:
         cannot_remove_user_plugin_from_current_user: "Du kan ikke deaktivere 'Brugere' for en bruger, der er logget på."
       form:
         blank_password_keeps_current: Hvis du ikke indtaster noget, beholdes den nuværende adgangskode
       index:
         create_new_user: Opret en ny bruger
-        no_users_yet: Der er ingen brugere endnu. Klik "Opret en ny bruger" for at oprette den første.
       user:
-        confirm_delete_message: "Er du sikker på du vil slette '%{who}'?"
-        confirm_delete_title: Slet bruger
-        edit_user: Redigér bruger
         email_user: Send e-mail
         preview: (%{who}) oprettet %{created_at}
   sessions:
-    login_successful: Du er logget på
-    login_failed: Beklager, dit brugernavn eller adgangskode er forkert.
-    logged_out: Du er logget af.
     new:
-      login: Brugernavn
-      log_in: Log på
-      cancel: Annullér
-      password: Adgangskode
-      remember_me: Husk mig
-      or: eller
       forgot_password: Jeg har glemt mit password
       hello_please_sign_in: Hej! Du skal logge ind
       sign_in: log ind
   users:
     setup_website_name_html: "Lad os først give websitet et navn. <a href='%{link}' name='%{title}'>Her</a> kan du rette navnet"
-    signup_disabled: Brugeroprettelse er deaktiveret
     new:
       fill_form: Indtast dine oplysninger, så vi kan få dig i gang med Refinery.
       sign_up: Opret bruger
     create:
       welcome: Velkommen til Refinery, %{who}
-      signup_complete: Du er nu oprettet.
     forgot:
       email_address: E-mail-adresse
       enter_email_address: Indtast venligst den email-adresse til din konto.
@@ -55,33 +38,12 @@ da:
       code_invalid: "Vi beklager, men denne nulstilling kode er udløbet eller ugyldig. Hvis du har spørgsmål kan du prøve at kopiere og indsætte webadressen fra din e-mail til din browser eller genstarte reset password proces."
       successful: "Adgangskode reset succes for %{email}"
   user_mailer:
-    please_activate: Du skal aktivere din nye brugerkonto
-    activated: Din konto er nu aktiveret.
-    activated_email: "%{who}, din konto er nu aktiveret. Du kan nu begynde at tilføje plug-ins:"
-    account_created: Din konto er nu oprettet.
-    user_name: Brugernavn %{name}
-    password: Adgangskode %{password}
-    visit_url: "Du aktiverer din brugerkonto ved at følge dette link:"
-    link_to_reset_your_password: Link til nulstilling af din adgangskode
-  authlogic:
-    error_messages:
-      login_blank: skal udfyldes
-      login_not_found: er ugyldigt
-      login_invalid: må kun indeholde bogstaver, tal, mellemrum og tegnene '.-_@'.
-      consecutive_failed_logins_limit_exceeded: Din konto er nu spærret pga. for mange forgæves forsøg på at logge på.
-      email_invalid: er ikke en gyldig e-mail-adresse.
-      password_blank: skal udfyldes
-      password_invalid: er ikke gyldigt
-      not_active: Din brugerkonto er ikke aktiv
-      not_confirmed: Du skal bekræfte din brugerkonto, før du kan logge på
-      not_approved: Din brugerkonto er ikke godkendt
-      no_authentication_details: Angiv brugernavn og adgangskode
-    models:
-      user_session: UserSession
+    reset_notification:
+      subject: Link til nulstilling af din adgangskode
+  activerecord:
     attributes:
-      user_session:
+      user:
         login: brugernavn
         email: e-mail
         password: adgangskode
         remember_me: husk mig
-        incorrect: "Beklager, dit %{login_field} eller adgangskode er forkert."