jro_apps/redmine Commit - r166:4ccbc65628ef

added translated strings for settings view...

Jean-Philippe Lang -

r166:4ccbc65628ef

parent child

Context file:

r166:4ccbc65628ef

Collapse all files

app/views/feeds/news.rxml +1 -1

             xml.instruct!
             xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
               xml.channel do
-                xml.title "#{Setting.header_title}: #{l(:label_news_latest)}"
+                xml.title "#{Setting.app_title}: #{l(:label_news_latest)}"
                 xml.link url_for(:controller => '', :only_path => false)
                 xml.pubDate CGI.rfc1123_date(@news.first.created_on)
                 xml.description l(:label_news_latest)

app/views/layouts/base.rhtml +3 -3

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
-            <title><%= Setting.header_title + (@html_title ? ": #{@html_title}" : "") %></title>
+            <title><%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="redMine" />
             <meta name="keywords" content="issue,bug,tracker" />
                 <div id="header">
                 <div style="float: left;">
-                    <h1><%= Setting.header_title %></h1>
+                    <h1><%= Setting.app_title %></h1>
-                    <h2><%= Setting.header_subtitle %></h2>
+                    <h2><%= Setting.app_subtitle %></h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
                   <% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>

app/views/settings/edit.rhtml +13 -13

             <%= start_form_tag({:action => 'edit'}, :class => "tabular") %>
             <div class="box">
-            <p><label>header_title</label>
+            <p><label><%= l(:setting_app_title) %></label>
-            <%= text_field_tag 'settings[header_title]', Setting.header_title, :size => 30 %></p>
+            <%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
-            <p><label>header_subtitle</label>
+            <p><label><%= l(:setting_app_subtitle) %></label>
-            <%= text_field_tag 'settings[header_subtitle]', Setting.header_subtitle, :size => 60 %></p>
+            <%= text_field_tag 'settings[app_subtitle]', Setting.app_subtitle, :size => 60 %></p>
-            <p><label>welcome_text</label>
+            <p><label><%= l(:setting_welcome_text) %></label>
             <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %></p>
-            <p><label>default_language</label>
+            <p><label><%= l(:setting_default_language) %></label>
             <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
-            <p><label>login_required</label>
+            <p><label><%= l(:setting_login_required) %></label>
             <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
-            <p><label>self_registration</label>
+            <p><label><%= l(:setting_self_registration) %></label>
             <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
-            <p><label>attachment_max_size</label>
+            <p><label><%= l(:setting_attachment_max_size) %></label>
-            <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %></p>
+            <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
-            <p><label>mail_from</label>
+            <p><label><%= l(:setting_mail_from) %></label>
             <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
-            <p><label>host_name</label>
+            <p><label><%= l(:setting_host_name) %></label>
             <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
-            <p><label>text_formatting</label>
+            <p><label><%= l(:setting_text_formatting) %></label>
             <%= select_tag 'settings[text_formatting]', options_for_select( [[l(:label_none), 0], ["textile", "textile"]], Setting.text_formatting) %></p>
             </div>

config/settings.yml +2 -2

             # DO NOT MODIFY THIS FILE !!!
             # Settings can be defined through the application in Admin -> Settings
-            header_title:
+            app_title:
               default: redMine
-            header_subtitle:
+            app_subtitle:
               default: Project management
             welcome_text:
               default:

lang/de.yml +11 0

@@ -140,6 +140,17 field_hide_mail: Mein email address verstecken
140	field_comment: Anmerkung	140	field_comment: Anmerkung
141	field_url: URL	141	field_url: URL
142		142
		143	setting_app_title: Applikation Titel
		144	setting_app_subtitle: Applikation Untertitel
		145	setting_welcome_text: Willkommener Text
		146	setting_default_language: Rückstellung Sprache
		147	setting_login_required: Authent. erfordert
		148	setting_self_registration: Selbstausrichtung ermöglicht
		149	setting_attachment_max_size: Dateimaximumgröße
		150	setting_mail_from: Emission address
		151	setting_host_name: Host Name
		152	setting_text_formatting: Textformatierung
		153
143	label_user: Benutzer	154	label_user: Benutzer
144	label_user_plural: Benutzer	155	label_user_plural: Benutzer
145	label_user_new: Neuer Benutzer	156	label_user_new: Neuer Benutzer

lang/en.yml +11 0

@@ -140,6 +140,17 field_hide_mail: Hide my email address
140	field_comment: Comment	140	field_comment: Comment
141	field_url: URL	141	field_url: URL
142		142
		143	setting_app_title: Application title
		144	setting_app_subtitle: Application subtitle
		145	setting_welcome_text: Welcome text
		146	setting_default_language: Default language
		147	setting_login_required: Authent. required
		148	setting_self_registration: Self-registration enabled
		149	setting_attachment_max_size: Attachment max. size
		150	setting_mail_from: Emission mail address
		151	setting_host_name: Host name
		152	setting_text_formatting: Text formatting
		153
143	label_user: User	154	label_user: User
144	label_user_plural: Users	155	label_user_plural: Users
145	label_user_new: New user	156	label_user_new: New user

lang/es.yml +11 0

@@ -140,6 +140,17 field_hide_mail: Ocultar mi email address
140	field_comment: Comentario	140	field_comment: Comentario
141	field_url: URL	141	field_url: URL
142		142
		143	setting_app_title: Título del aplicación
		144	setting_app_subtitle: Subtítulo del aplicación
		145	setting_welcome_text: Texto acogida
		146	setting_default_language: Lengua del defecto
		147	setting_login_required: Autentif. requerida
		148	setting_self_registration: Registro permitido
		149	setting_attachment_max_size: Tamaño máximo del fichero
		150	setting_mail_from: Email de la emisión
		151	setting_host_name: Nombre de anfitrión
		152	setting_text_formatting: Formato de texto
		153
143	label_user: Usuario	154	label_user: Usuario
144	label_user_plural: Usuarios	155	label_user_plural: Usuarios
145	label_user_new: Nuevo usuario	156	label_user_new: Nuevo usuario

lang/fr.yml +11 0

@@ -140,6 +140,17 field_hide_mail: Cacher mon adresse mail
140	field_comment: Commentaire	140	field_comment: Commentaire
141	field_url: URL	141	field_url: URL
142		142
		143	setting_app_title: Titre de l'application
		144	setting_app_subtitle: Sous-titre de l'application
		145	setting_welcome_text: Texte d'accueil
		146	setting_default_language: Langue par défaut
		147	setting_login_required: Authentif. obligatoire
		148	setting_self_registration: Enregistrement autorisé
		149	setting_attachment_max_size: Taille max des fichiers
		150	setting_mail_from: Adresse d'émission
		151	setting_host_name: Nom d'hôte
		152	setting_text_formatting: Formatage du texte
		153
143	label_user: Utilisateur	154	label_user: Utilisateur
144	label_user_plural: Utilisateurs	155	label_user_plural: Utilisateurs
145	label_user_new: Nouvel utilisateur	156	label_user_new: Nouvel utilisateur

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