jro_apps/redmine Commit - r15:18ee1fef4172

notice messages translation...

Jean-Philippe Lang -

r15:18ee1fef4172

parent child

Context file:

r15:18ee1fef4172

Expand all files

redmine/app/controllers/account_controller.rb +9 -4

               # Change logged in user's password
               def change_password
                 @user = self.logged_in_user
-                flash.now[:notice] = l(:notice_can_t_change_password) and render :action => 'my_account' and return if @user.auth_source_id
+                flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'my_account' and return if @user.auth_source_id
                 if @user.check_password?(@params[:password])
                   @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-                  flash.now[:notice] = l(:notice_account_password_updated) if @user.save
+                  if @user.save
+                    flash[:notice] = l(:notice_account_password_updated)
+                  else
+                    render :action => 'my_account'
+                    return
+                  end
                 else
-                  flash.now[:notice] = l(:notice_account_wrong_password)
+                  flash[:notice] = l(:notice_account_wrong_password)
                 end
-                render :action => 'my_account'
+                redirect_to :action => 'my_account'
               end
               # Enable user to choose a new password

redmine/app/controllers/admin_controller.rb +1 -1

                     a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s
                     a.save
                   }
-                  flash[:notice] = "Mail options were successfully updated."
+                  flash.now[:notice] = l(:notice_successful_update)
                 end
               end

redmine/app/controllers/application.rb +3 -5

               def require_login
                 unless self.logged_in_user
                   store_location
-                  redirect_to(:controller => "account", :action => "login")
+                  redirect_to :controller => "account", :action => "login"
                   return false
                 end
                 true
               def require_admin
                 return unless require_login
                 unless self.logged_in_user.admin?
-                  flash[:notice] = "Acces denied"
+                  render :nothing => true, :status => 403
-                  redirect_to:controller => ''
                   return false
                 end
                 true
                 if @user_membership and Permission.allowed_to_role( "%s/%s" % [ @params[:controller], @params[:action] ], @user_membership.role_id )
                   return true
                 end
-                flash[:notice] = "Acces denied"
+                render :nothing => true, :status => 403
-                redirect_to :controller => ''
                 false
               end

redmine/app/controllers/custom_fields_controller.rb +2 -1

                     return
                 end
                 if request.post? and @custom_field.save
+                  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
                 @trackers = Tracker.find(:all)
                   if @custom_field.is_a? IssueCustomField
                     @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
                   end
-                  flash[:notice] = 'Custom field was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @trackers = Tracker.find(:all)

redmine/app/controllers/documents_controller.rb +1 -1

               def edit
                 @categories = Enumeration::get_values('DCAT')
                 if request.post? and @document.update_attributes(params[:document])
-                  flash[:notice] = 'Document was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @document
                 end
               end

redmine/app/controllers/issue_categories_controller.rb +1 -1

               def edit
                 if request.post? and @category.update_attributes(params[:category])
-                  flash[:notice] = 'Issue category was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project
                 end
               end

redmine/app/controllers/issue_statuses_controller.rb +2 -2

               def create
                 @issue_status = IssueStatus.new(params[:issue_status])
                 if @issue_status.save
-                  flash[:notice] = 'IssueStatus was successfully created.'
+                  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 else
                   render :action => 'new'
               def update
                 @issue_status = IssueStatus.find(params[:id])
                 if @issue_status.update_attributes(params[:issue_status])
-                  flash[:notice] = 'IssueStatus was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 else
                   render :action => 'edit'

redmine/app/controllers/issues_controller.rb +2 -2

             			@issue.custom_values = @custom_values
             			@issue.attributes = params[:issue]
             			if @issue.save
-            				flash[:notice] = 'Issue was successfully updated.'
+            				flash[:notice] = l(:notice_successful_update)
             				redirect_to :action => 'show', :id => @issue
             			end
             		end
             				@issue.fixed_version_id = (params[:issue][:fixed_version_id])
             				@issue.assigned_to_id = (params[:issue][:assigned_to_id])
             				if @issue.save
-            					flash[:notice] = 'Issue was successfully updated.'
+            					flash[:notice] = l(:notice_successful_update)
             					Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
             					redirect_to :action => 'show', :id => @issue
             				end

redmine/app/controllers/members_controller.rb +2 -2

             	def edit
             		if request.post? and @member.update_attributes(params[:member])
-            			flash[:notice] = 'Member was successfully updated.'
+            			flash[:notice] = l(:notice_successful_update)
             			redirect_to :controller => 'projects', :action => 'settings', :id => @project
             		end
             	end
             	def destroy
             		@member.destroy
-                flash[:notice] = 'Member was successfully removed.'
+                flash[:notice] = l(:notice_successful_delete)
             		redirect_to :controller => 'projects', :action => 'settings', :id => @project
             	end

redmine/app/controllers/news_controller.rb +1 -1

               def edit
                 if request.post? and @news.update_attributes(params[:news])
-                  flash[:notice] = 'News was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @news
                 end
               end

redmine/app/controllers/projects_controller.rb +10 -6

                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if @project.save
-                    flash[:notice] = 'Project was successfully created.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
                     @project.custom_values = @custom_values
                   end
                   if @project.update_attributes(params[:project])
-                    flash[:notice] = 'Project was successfully updated.'
+                    flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
+              	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :id => @project
               	end
               end
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
-                    flash[:notice] = 'Member was successfully added.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   if @document.save
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_documents', :id => @project
                   end
                 end
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
-                    flash[:notice] = "Issue was successfully added."
+                    flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                     if @attachment.save
+                      flash[:notice] = l(:notice_successful_create)
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   end
               # used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue
-                flash[:notice] = 'Project not found.'
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/roles_controller.rb +3 -3

                 if request.post?
                   @role.permissions = Permission.find(@params[:permission_ids]) if @params[:permission_ids]
                   if @role.save
-                    flash[:notice] = 'Role was successfully created.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 if request.post? and @role.update_attributes(params[:role])
                   @role.permissions = Permission.find(@params[:permission_ids] || [])
                   Permission.allowed_to_role_expired
-                  flash[:notice] = 'Role was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
                     }
                   }
                   if @role.save
-                    flash[:notice] = 'Workflow was successfully updated.'
+                    flash[:notice] = l(:notice_successful_update)
                   end
                 end
                 @roles = Role.find_all

redmine/app/controllers/trackers_controller.rb +4 -4

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class TrackersController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :require_admin
+              before_filter :require_admin
               def index
                 list
               def new
                 @tracker = Tracker.new(params[:tracker])
                 if request.post? and @tracker.save
-                  flash[:notice] = 'Tracker was successfully created.'
+                  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
               end
               def edit
                 @tracker = Tracker.find(params[:id])
                 if request.post? and @tracker.update_attributes(params[:tracker])
-                  flash[:notice] = 'Tracker was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end

redmine/app/controllers/users_controller.rb +2 -2

                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                   @user.custom_values = @custom_values
                   if @user.save
-                    flash[:notice] = 'User was successfully created.'
+                    flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                     @user.custom_values = @custom_values
                   end
                   if @user.update_attributes(params[:user])
-                    flash[:notice] = 'User was successfully updated.'
+                    flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'list'
                   end
                 end

redmine/app/controllers/versions_controller.rb +20 -19

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class VersionsController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :find_project, :authorize
+              before_filter :find_project, :authorize
-            	def edit
+              def edit
-            		if request.post? and @version.update_attributes(params[:version])
+                if request.post? and @version.update_attributes(params[:version])
-                  flash[:notice] = 'Version was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project
-            		end
+                end
-            	end
+              end
-            	def destroy
+              def destroy
-            		@version.destroy
+                @version.destroy
-            		redirect_to :controller => 'projects', :action => 'settings', :id => @project
+                redirect_to :controller => 'projects', :action => 'settings', :id => @project
               rescue
                 flash[:notice] = "Unable to delete version"
-            		redirect_to :controller => 'projects', :action => 'settings', :id => @project
+                redirect_to :controller => 'projects', :action => 'settings', :id => @project
-            	end
+              end
               def download
                 @attachment = @version.attachments.find(params[:attachment_id])
                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
-                flash[:notice]="Requested file doesn't exist or has been deleted."
+                flash[:notice] = l(:notice_file_not_found)
                 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
               def destroy_file
                 @version.attachments.find(params[:attachment_id]).destroy
+                flash[:notice] = l(:notice_successful_delete)
                 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
             private
-            	def find_project
+              def find_project
                 @version = Version.find(params[:id])
-            		@project = @version.project
+                @project = @version.project
-            	end
+              end
             end

redmine/app/helpers/application_helper.rb +1 -1

               end
               def lang_options_for_select
-                GLoc.valid_languages.collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+                (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
               end
             end

redmine/app/helpers/custom_fields_helper.rb +8 -5

               def custom_field_tag(custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "custom_fields[#{custom_field.id}]"
+                field_id = "custom_fields_#{custom_field.id}"
                 case custom_field.field_format
                 when "string", "int", "date"
-                  text_field_tag field_name, custom_value.value
+                  text_field_tag field_name, custom_value.value, :id => field_id
                 when "text"
-                  text_area_tag field_name, custom_value.value, :cols => 60, :rows => 3
+                  text_area_tag field_name, custom_value.value, :id => field_id, :cols => 60, :rows => 3
                 when "bool"
-                  check_box_tag(field_name, "1", custom_value.value == "1") +
+                  check_box_tag(field_name, "1", custom_value.value == "1", :id => field_id) +
                   hidden_field_tag(field_name, "0")
                 when "list"
                   select_tag field_name,
                               "<option></option>" + options_for_select(custom_field.possible_values.split('|'),
-                              custom_value.value)
+                              custom_value.value), :id => field_id
                 end
               end
               def custom_field_label_tag(custom_value)
                 content_tag "label", custom_value.custom_field.name +
-            	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : "")
+            	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
+            	:for => "custom_fields_#{custom_value.custom_field.id}"
               end
               def custom_field_tag_with_label(custom_value)

redmine/app/views/account/my_account.rhtml +3 -3

             <div class="splitcontentleft">
               <div class="box">
               <h3><%=l(:label_information_plural)%></h3>
-              &nbsp;
               <%= start_form_tag :action => 'my_account' %>
               <!--[form:user]-->
               <%= text_field 'user', 'lastname'  %></p>
               <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label><br/>
-              <%= text_field 'user', 'mail' %></p>
+              <%= text_field 'user', 'mail', :size => 40 %></p>
               <p><label for="user_language"><%=l(:field_language)%></label><br/>
               <%= select("user", "language", lang_options_for_select) %></p>
             <% unless @user.auth_source_id %>
               <div class="box">
               <h3><%=l(:field_password)%></h3>
-              &nbsp;
               <%= start_form_tag :action => 'change_password' %>
               <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label><br/>

redmine/app/views/admin/mail_options.rhtml +12 -3

@@ -3,10 +3,19
3	<p><%=l(:text_select_mail_notifications)%></p>	3	<p><%=l(:text_select_mail_notifications)%></p>
4		4
5	<%= start_form_tag ({}, :id => 'mail_options_form')%>	5	<%= start_form_tag ({}, :id => 'mail_options_form')%>
6	<% for action in @actions %>	6
7	<%= check_box_tag "action_ids[]", action.id, action.mail_enabled? %>	7	<% actions = @actions.group_by {\|p\| p.group_id } %>
8	<%= action.description %><br />	8	<% actions.keys.sort.each do \|group_id\| %>
		9	<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
		10	<% actions[group_id].each do \|p\| %>
		11	<div style="width:170px;float:left;"><%= check_box_tag "action_ids[]", p.id, p.mail_enabled? %>
		12	<%= l(p.description.to_sym) %>
		13	</div>
		14	<% end %>
		15	</fieldset>
9	<% end %>	16	<% end %>
		17
		18
10	<br />	19	<br />
11	<p>	20	<p>
12	<a href="javascript:checkAll('mail_options_form', true)"><%=l(:button_check_all)%></a> \|	21	<a href="javascript:checkAll('mail_options_form', true)"><%=l(:button_check_all)%></a> \|

redmine/app/views/projects/show.rhtml +2 -4

               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <% for news in @news %>
-                  <p>
+                  <p><b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
-                  <b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
                   <%= news.summary %>
-                  <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
+                  <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small></p>
-                  </p>
                   <hr />
                 <% end %>
                 <center><small>[ <%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>

redmine/lang/es.yml +17 -17

             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: is not a number
-            general_fmt_age: %d yr
+            general_fmt_age: %d año
-            general_fmt_age_plural: %d yrs
+            general_fmt_age_plural: %d años
-            general_fmt_date: %%b %%d, %%Y (%%a)
+            general_fmt_date: %%d/%%m/%%Y
-            general_fmt_datetime: %%b %%d, %%Y (%%a), %%I:%%M %%p
+            general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
-            general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+            general_fmt_datetime_short: %%d/%%m %%H:%%M
-            general_fmt_time: %%I:%%M %%p
+            general_fmt_time: %%H:%%M
             general_text_No: 'No'
-            general_text_Yes: 'Yes'
+            general_text_Yes: 'Sí'
             general_text_no: 'no'
-            general_text_yes: 'yes'
+            general_text_yes: 'sí'
             general_lang_es: 'Español'
             notice_account_updated: Account was successfully updated.
             notice_file_not_found: Requested file doesn't exist or has been deleted.
             gui_validation_error: 1 error
-            gui_validation_error_plural: %d errors
+            gui_validation_error_plural: %d errores
             field_name: Nombre
             field_description: Descripción
             field_lastname: Apellido
             field_mail: Email
             field_filename: Fichero
-            #field_filesize: Size
+            field_filesize: Tamaño
             field_downloads: Telecargas
             field_author: Autor
             field_created_on: Creado
             field_updated_on: Actualizado
-            #field_field_format: Format
+            field_field_format: Formato
             field_is_for_all: Para todos los proyectos
             field_possible_values: Valores posibles
             field_regexp: Expresión regular
             field_project: Proyecto
             field_issue: Petición
             field_status: Estatuto
-            #field_notes: Notes
+            field_notes: Notas
             field_is_closed: Petición resuelta
             field_is_default: Estatuto por defecto
             field_html_color: Color
             label_information_plural: Informaciones
             label_please_login: Conexión
             #label_register: Register
-            #label_password_lost: Lost password
+            label_password_lost: ¿Olvidaste la contraseña?
             label_home: Acogida
             label_my_page: Mi página
             label_my_account: Mi cuenta
             label_version_new: Nueva versión
             label_version_plural: Versiónes
             label_confirmation: Confirmación
-            #label_export_csv: Export to CSV
+            label_export_csv: Exportar a CSV
             label_read: Leer...
             label_public_projects: Proyectos publicos
             label_open_issues: Abierta
             text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
             text_workflow_edit: Seleccionar un workflow para actualizar
-            #default_role_manager: Manager
+            default_role_manager: Manager
-            #default_role_developper: Developer
+            default_role_developper: Desarrollador
-            #default_role_reporter: Reporter
+            default_role_reporter: Informador
             default_tracker_bug: Anomalía
             default_tracker_feature: Evolución
             default_tracker_support: Asistencia

redmine/public/stylesheets/application.css +2 -2

             }
             #content h2 a{font-weight:normal;}
-            #content h3{margin:0 0 5px 0; font-size:1.4em; letter-spacing:-1px;}
+            #content h3{margin:0 0 12px 0; font-size:1.4em; letter-spacing:-1px;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             	background-color:#CEE1ED;
             }
-            hr { border:0px; border-bottom:1px dashed #000000; }
+            hr { border:none; border-bottom: dotted 2px #c0c0c0; }
             /**************** Sidebar styles ****************/

redmine/test/integration/account_test.rb +7 -2

                 post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello2"
                 assert_response :success
+                assert_template "account/my_account"
                 assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
+                post "account/change_password", :password => 'jsmithZZ', :new_password => "hello", :new_password_confirmation => "hello"
+                assert_redirected_to "account/my_account"
+                assert_equal 'Wrong password', flash[:notice]
                 post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello"
-                assert_response :success
+                assert_redirected_to "account/my_account"
                 log_user('jsmith', 'hello')
               end

redmine/test/integration/admin_test.rb +1 -1

                 assert_template "projects/add"
                 post "projects/add", :project => { :name => "blog", :description => "weblog", :is_public => 1}
                 assert_redirected_to "admin/projects"
-                assert_equal 'Project was successfully created.', flash[:notice]
+                assert_equal 'Successful creation.', flash[:notice]
                 project = Project.find_by_name("blog")
                 assert_kind_of Project, project

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages