diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-21 12:31:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-21 12:31:16 +0000 |
| commit | 4ccbc65628efd10cb83ddcc884dc0a4aba3e0b92 (patch) | |
| tree | e0a3f076cb67fd9aca7c79139ae225f7625a4f3d /app | |
| parent | 9a2753931bd4dcf30d6de995d1943d374ebb877d (diff) | |
| download | redmine-4ccbc65628efd10cb83ddcc884dc0a4aba3e0b92.tar.gz redmine-4ccbc65628efd10cb83ddcc884dc0a4aba3e0b92.zip | |
added translated strings for settings view
git-svn-id: http://redmine.rubyforge.org/svn/trunk@169 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/feeds/news.rxml | 2 | ||||
| -rw-r--r-- | app/views/layouts/base.rhtml | 6 | ||||
| -rw-r--r-- | app/views/settings/edit.rhtml | 26 |
3 files changed, 17 insertions, 17 deletions
diff --git a/app/views/feeds/news.rxml b/app/views/feeds/news.rxml index 41fb0cade..67c358d8d 100644 --- a/app/views/feeds/news.rxml +++ b/app/views/feeds/news.rxml @@ -1,7 +1,7 @@ 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)
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index e4c35b6bd..f4d45f029 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -1,7 +1,7 @@ <!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" />
@@ -23,8 +23,8 @@ <div id="header">
<div style="float: left;">
- <h1><%= Setting.header_title %></h1>
- <h2><%= Setting.header_subtitle %></h2>
+ <h1><%= Setting.app_title %></h1>
+ <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 %>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml index fcbb40f91..d1ec82200 100644 --- a/app/views/settings/edit.rhtml +++ b/app/views/settings/edit.rhtml @@ -2,34 +2,34 @@ <%= start_form_tag({:action => 'edit'}, :class => "tabular") %> <div class="box"> -<p><label>header_title</label> -<%= text_field_tag 'settings[header_title]', Setting.header_title, :size => 30 %></p> +<p><label><%= l(:setting_app_title) %></label> +<%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p> -<p><label>header_subtitle</label> -<%= text_field_tag 'settings[header_subtitle]', Setting.header_subtitle, :size => 60 %></p> +<p><label><%= l(:setting_app_subtitle) %></label> +<%= 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> -<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %></p> +<p><label><%= l(:setting_attachment_max_size) %></label> +<%= 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> |