Merge pull request VizirAdmin#1 from u2ix/master

Translated app to english

Author: VizirAdmin

app/controllers/application_controller.rb

@@ -1,8 +1,17 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  before_filter :set_language
+
   def can_access?
     current_user.id == @note.user_id
   end
 
+
+  private
+  def set_language
+    if !current_user.nil?
+      I18n.locale = current_user.language || I18n.default_locale
+    end
+  end
 end
 

app/models/user.rb

@@ -6,11 +6,14 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :username
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :username, :language
 
   validates_presence_of :username
   validates_uniqueness_of :username, :case_sensitive => false
   validates_format_of :username, :with => /^[A-Za-z\d_]+$/
 
+  def self.languages
+    {'pt-BR' => 'Portugues', 'en' => 'English'}
+  end
 end
 

app/views/devise/registrations/edit.html.haml

@@ -40,6 +40,9 @@
         = I18n.t('devise.registrations.hint_current_password')
       %br/
       = f.password_field :current_password
+    %p
+      = f.label :language
+      %br= f.select :language, User.languages.invert
     %p= f.submit I18n.t('update')
   = link_to I18n.t('back'), root_path
 

app/views/devise/sessions/new.html.haml

@@ -23,19 +23,15 @@
   %br
   = link_to I18n.t('user.forgot_password'), new_password_path(resource_name)
   %br
+  %p= I18n.t('user.demo').html_safe
   %p
-  Quer conhecer antes o Snote?
-  %br
-  Acesse com a conta demo:
-  %br
-  %b E-mail:
-  %i demo@snote.com
-  %br
-  %b Senha:
-  %i snote11
+    %b E-mail:
+    %i demo@snote.com
+    %br
+    %b= I18n.t('user.password')+':'
+    %i snote11
 #credit
   %p
-    <strong>Um #{link_to "projeto", "http://github.com/Vizir/snote"} <i>open source</i> desenvolvido por:</strong> #{link_to "Fabrício Ferrari de Campos", "http://twitter.com/fabricioffc"}.
-
-  <strong>Uma iniciativa do time do</strong> #{link_to "Vizir", "http://www.vizir.com.br"}.
-
+    %strong= t('credit.footer', :project_link => link_to(t('credit.project'), 'http://github.com/Vizir/snote'), :author => link_to('Fabrício Ferrari de Campos', 'http://twitter.com/fabricioffc')).html_safe
+    %br
+    %strong= t('credit.initiative', :link => link_to("Vizir", "http://www.vizir.com.br")).html_safe

app/views/notes/_form.html.haml

@@ -22,39 +22,34 @@
     = link_to I18n.t('back'), notes_path
 .Right
   #help_text
-  %h2 Formatando o texto
-  %p
-    A formatação é feita com o
-    %em
-      = link_to 'Textile', "http://redcloth.org/hobix.com/textile/", :target => "_blank"
-    \.
-  %p
-    Possibilitando uma formatação simples, atráves de marcações fáceis.
-
-  %p
-    Segue alguns exemplos:
-
+  %h2= t('format.title')
+  %p= t('format.desc', :textile_link => link_to('Textile', "http://redcloth.org/hobix.com/textile/", :target => "_blank")).html_safe
+  %p= t('format.examples')
   .textileexamples
     %p
-      *negrito* → <strong>negrito</strong>
-      %br
-      _itálico_ →
-      %em
-        itálico
-      %br
+      = "*"+t('format.bold')+"*"
+      → 
+      %strong= t('format.bold')
+    %p
+      = "_"+t('format.italic')+"_"
+      → 
+      %em= t('format.italic')
+    %p
       "link":http://google.com →
       = link_to "link","http://google.com", :target => "_blank"
-      %br
-      pre. →  texto pré-formatado (<i>pre</i> do html)
-      %br
-      * → lista com marcador
-      %br
-      ** → segundo nível
-      %br
-      \# → lista numerada
-      %br
-      \## → segundo nível
-      %br
-      Veja mais marcações em:
-      = link_to "exemplo",notes_example_path, :target=> "_blank"
-
+    %p
+      pre. →  
+      = t('format.pre')
+    %p
+      * → 
+      = t('format.ul')
+    %p
+      ** → 
+      = t('format.2ndlevel')
+    %p
+      \# → 
+      = t('format.ol')
+    %p
+      \## → 
+      = t('format.2ndlevel')
+    %p= t('format.see', :link => link_to(t('format.example'),notes_example_path, :target=> "_blank")).html_safe

config/locales/devise.en.yml

@@ -33,6 +33,8 @@ en:
       inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
       updated: 'You updated your account successfully.'
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+      hint_alter_password: "(leave it blank if you don't wan't to change your password.)"
+      hint_current_password: "(needed for updating your account)"
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'

config/locales/en.yml

@@ -1,5 +1,58 @@
-# 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.
-
 en:
-  hello: "Hello world"
+  # snote
+  please_wait: "Wait..."
+  please_wait_searching: "Searching..."
+  confirmation: "Are you shure?"
+  back: "Back"
+  error: "Error"
+  login: "Login"
+  update: "Refresh"
+  logout: "Logout"
+  search: "Search"
+  my_new_note: "Check my new note:"
+  note:
+    new: "New"
+    edit: "Edit"
+    delete: "Remove"
+    creating: "Create note"
+    editing: "Edit note"
+    notags: "No tags."
+    zero_notes: "<div>There are no notes.</div><div>Click on button <b>new</b> and create your first note.</div>"
+    textk: "Text*"
+    not_found: "<div>Note not found.</div><div><a href='/'><b>*Back*</b></a></div>"
+    powered_by: "Powerd by:"
+    share: "Share"
+  format:
+    title: "Formatting text"
+    desc: "Text is formatted using %{textile_link} markup.<br>This makes it simple to apply formattings using an easy markup."
+    examples: "Some examples:" 
+    bold: "Bold"
+    italic: "italic"
+    pre: "pre formatting like in html"
+    ul: "bulleted list"
+    ol: "numbered list"
+    2ndlevel: "2nd level"
+    see: "See the example note: %{link}"
+    example: "example"
+  user:
+    creating: "Register"
+    sign_up: "Register"
+    edit: "Edit"
+    edit_link: "Account settings"
+    editing: "Account settings"
+    forgot_password: "Forgot password?"
+    info_to_recover_password: "Email will be send to your inbox"
+    recover_password: "You will recieve a email for recover your account"
+    update_password: "Change password"
+    password: "Password"
+    title_to_change_password: "Change password"
+    anonymous: "Anonym"
+    demo: "Like to try out snote?<br />Login with the demo account:"
+  credit:
+    footer: "An open source %{project_link} by %{author}"
+    project: "project"
+    initiative: "An initiative of the team %{link}"
+  helpers:
+    submit:
+      create: "Create %{model}"
+      update: "Update %{model}"

config/locales/pt-BR.yml

@@ -22,6 +22,18 @@ pt-BR:
     not_found: "<div>Nenhuma anotação foi encontrada.</div><div><a href='/'><b>*Voltar*</b></a></div>"
     powered_by: "Criada por:"
     share: "Compartilhar"
+  format:
+    title: "Formatando o texto"
+    desc: "A formatação é feita com o %{textile_link}.<br>Possibilitando uma formatação simples, atráves de marcações fáceis."
+    examples: "Segue alguns exemplos:"
+    bold: "negrito"
+    italic: "itálico"
+    pre: "texto pré-formatado (pre do html)"
+    ul: "lista com marcador"
+    ol: "lista numerada"
+    2ndlevel: "segundo nível"
+    see: "Veja mais marcações em: %{link}"
+    example: "exemplo"
   user:
     creating: "Registro"
     sign_up: "Registrar-se"
@@ -34,6 +46,12 @@ pt-BR:
     update_password: "Alterar a minha senha"
     title_to_change_password: "Alteração da senha de acesso"
     anonymous: "Anônimo"
+    demo: "Quer conhecer antes o Snote?<br/>Acesse com a conta demo:"
+    password: "Senha"
+  credit:
+    footer: "Um %{project_link} <i>open source</i> desenvolvido por: %{author}"
+    project: "projeto"
+    initiative: "Uma iniciativa do time do %{link}"
   helpers:
     submit:
       create: "Criar %{model}"
@@ -194,6 +212,7 @@ pt-BR:
         password: "Senha"
         remember_me: "lembrar login?"
         username: "Usuário"
+        language: "Linguagem"
     errors:
       template:
         header:

db/migrate/20110619143728_add_language_to_users.rb

@@ -0,0 +1,9 @@
+class AddLanguageToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :language, :string
+  end
+
+  def self.down
+    remove_column :users, :language
+  end
+end

public/stylesheets/snote.css

@@ -158,6 +158,7 @@ position:absolute;
 #snote #help_text{min-width:200px;padding:5px 20px 0 9px;}
 
 #snote .textileexamples{margin-left:15px}
+#snote .textileexamples p {margin:0;padding: 0;}
 
 .Left{
   float:left;