ref: refs/heads/basesystem
commit df0e122cec886a028f359836e388d0d7068b5ca2
Author: Stefan Schubert
Date: Fri Sep 4 12:43:47 2009 +0200
added translation tags
---
.../app/controllers/application_controller.rb | 4 ++--
webclient/app/views/controlpanel/index.rhtml | 10 +++++-----
webclient/app/views/hosts/index.html.erb | 2 +-
webclient/app/views/layouts/main.rhtml | 4 ++--
webclient/app/views/sessions/new.rhtml | 2 +-
webclient/app/views/shared/exception_trap.html.erb | 9 +++++----
6 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/webclient/app/controllers/application_controller.rb b/webclient/app/controllers/application_controller.rb
index cbf9da7..50035b7 100644
--- a/webclient/app/controllers/application_controller.rb
+++ b/webclient/app/controllers/application_controller.rb
@@ -51,14 +51,14 @@ class ApplicationController < ActionController::Base
def ensure_login
unless logged_in?
- flash[:notice] = "Please login to continue"
+ flash[:notice] = _("Please login to continue")
redirect_to new_session_path
end
end
def ensure_logout
if logged_in?
- flash[:notice] = "You must logout before you can login"
+ flash[:notice] = _("You must logout before you can login")
redirect_to root_url
end
end
diff --git a/webclient/app/views/controlpanel/index.rhtml b/webclient/app/views/controlpanel/index.rhtml
index 5e4ea21..0f5aac6 100644
--- a/webclient/app/views/controlpanel/index.rhtml
+++ b/webclient/app/views/controlpanel/index.rhtml
@@ -27,7 +27,7 @@
<% host_name = host.nil? ? 'the machine' : "'#{host.name}'" %>
<div id="machine-controle">
<ul>
- <li><h4>System actions </h4></li>
+ <li><h4><%= _("System actions")%></h4></li>
<li><%= link_to _('Reboot'), {:controller => 'system', :action => 'reboot'},
:confirm => _("Really reboot #{host_name}?"), :method => :put, :class => 'button' %></li>
<li><%= link_to _('Shutdown'), {:controller => 'system', :action => 'shutdown'},
@@ -40,17 +40,17 @@
<div id="status_patches">
<% if ActionController::Routing.possible_controllers.include?("patch_updates") %>
- <img src="/images/working.gif" height="32" width="32" border="0" /> Loading patch information
+ <img src="/images/working.gif" height="32" width="32" border="0" /> <%= _("Loading patch information") %>
<% else %>
- Patch plugin is not installed.
+ <%= _("Patch plugin is not installed.") %>
<% end %>
</div>
<br/>
<div id="status_status">
<% if ActionController::Routing.possible_controllers.include?("status") %>
- <img src="/images/working.gif" height="32" width="32" border="0" /> Loading system information
+ <img src="/images/working.gif" height="32" width="32" border="0" /> <%= _("Loading system information") %>
<% else %>
- Status plugin is not installed.
+ <%= _("Status plugin is not installed.") %>
<% end %>
</div>
diff --git a/webclient/app/views/hosts/index.html.erb b/webclient/app/views/hosts/index.html.erb
index 0ff67c6..b82efb7 100644
--- a/webclient/app/views/hosts/index.html.erb
+++ b/webclient/app/views/hosts/index.html.erb
@@ -3,7 +3,7 @@
<div class="services-list dialoge-wrapper width-65">
<div class="dialoge-sub-wrapper">
- <h2>Please choose a service:</h2>
+ <h2><%= _("Please choose a service:") %></h2>
<ul class="list-2level-inline alternate-rows">
<% for host in @hosts %>
<li>
diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml
index d163ebb..c2756ae 100644
--- a/webclient/app/views/layouts/main.rhtml
+++ b/webclient/app/views/layouts/main.rhtml
@@ -32,7 +32,7 @@
<!-- custom page scripts and css -->
<%= yield :head %>
- <title>WebYaST</title>
+ <title><%= _("WebYaST") %></title>
</head>
<body id="shell" onload="">
@@ -40,7 +40,7 @@
<%= link_to(image_tag("/images/webyast-logo.png", :alt =>"webyast" ),"/") %>
- <h1>My Appliance</h1>
+ <h1><%= _("My Appliance") %></h1>
<div id="login-wrapper">
<% host = Host.find(session[:host]) rescue nil
diff --git a/webclient/app/views/sessions/new.rhtml b/webclient/app/views/sessions/new.rhtml
index da52874..1b7de96 100644
--- a/webclient/app/views/sessions/new.rhtml
+++ b/webclient/app/views/sessions/new.rhtml
@@ -1,7 +1,7 @@
<div id="login-dialogue">
<% form_tag( :action => 'create' ) do %>
- <h2 id="content_title">Login</h2>
+ <h2 id="content_title"><%= _("Login") %></h2>
<p><%= _("Enter login credentials for host #{@host.name}.") %></p>
diff --git a/webclient/app/views/shared/exception_trap.html.erb b/webclient/app/views/shared/exception_trap.html.erb
index 50ff941..8ef08d3 100644
--- a/webclient/app/views/shared/exception_trap.html.erb
+++ b/webclient/app/views/shared/exception_trap.html.erb
@@ -5,15 +5,16 @@ $(document).ready(function() {
});
</script>
-<h1>This is embarrasing....</h1>
+<h1><%= _("This is embarrasing....") %></h1>
-<p>We are sorry, but WebYaST is still in alpha and there are some problems.</p>
+<p><%= _("We are sorry, but WebYaST is still in alpha and there are some problems.") %></p>
-<h3>Problem:</h3>
+<h3><%= _("Problem:") %></h3>
<p><pre><%= h error.to_s %></pre></p>
-<p>Please <a href="<%= @bug_url %>">Report a bug so we can fix the problem!.</a> Don't forget to include the bug details.</p>
+<p><%= _("Please Report a bug so we can fix the problem!.") %><a href="<%= @bug_url %>"><%= _("(report link)") %></a>
+<%= _("Don't forget to include the bug details.") %></p>
<% backtrace = (error.nil? || error.backtrace.nil? || error.backtrace.blank?) ? _("No information available") : error.backtrace.join("\n") %>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
