Skip to content

Commit

Permalink
changed timeenhancement once more...replaced calls to current_user.la…
Browse files Browse the repository at this point in the history
…nguage to current_language, a helper method provided by gloc-plugin
  • Loading branch information
bakkdoor committed Sep 4, 2008
1 parent 769e3fa commit 360a08d
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 16 deletions.
4 changes: 4 additions & 0 deletions src/app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ def index
def new
@user = User.new
end

def show
@profile_user = User.find(params[:id])
end

def create
logout_keeping_session!
Expand Down
2 changes: 1 addition & 1 deletion src/app/helpers/messages_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module MessagesHelper

def reply_message(old_message)
new_message = " \n\n------------------------\n#{old_message.author.login} wrote (#{old_message.created_at.format(:language => current_user.language, :format => :long)}):\n_#{old_message.body}_"
new_message = " \n\n------------------------\n#{old_message.author.login} wrote (#{old_message.created_at.format(:language => current_language, :format => :long)}):\n_#{old_message.body}_"
end

end
2 changes: 1 addition & 1 deletion src/app/views/account/index.rhtml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="headline">
<%= l :account %>: <%= current_user.login %> - <%= l :last_login %>: <%= @last_login.format(:lang => current_user.language, :format => :long) %>
<%= l :account %>: <%= current_user.login %> - <%= l :last_login %>: <%= @last_login.format(:lang => current_language, :format => :long) %>
</div>
<%= l :you_currently_have_a_user_status_of %>: <%= User.level_name(current_user.user_level).capitalize %><br>
<br>
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/account/settings.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</tr>
<tr>
<td class="title"><%= l :member_since %></td>
<td class="value"><%= current_user.created_at.format(:lang => current_user.language, :format => :long) %></td>
<td class="value"><%= current_user.created_at.format(:lang => current_language, :format => :long) %></td>
</tr>
<tr>
<td class="title"><%= l :language %></td>
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/messages/index.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<td><%= link_to (h message.title), message %></td>
<td><%= link_to (h message.author.login), message.author %></td>
<td><%= link_to (h message.receiver.login), message.receiver %></td>
<td><%=h message.created_at.format :lang => current_user.language, :format => :long %></td>
<td><%=h message.created_at.format :lang => current_language, :format => :long %></td>
<td><%= link_to (l :reply), :action => :reply, :id => message %></td>
<td><%= link_to (l :destroy), message, :confirm => (l :are_you_sure?), :method => :delete %></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/messages/sent.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<td><%= link_to (h message.title), message %></td>
<td><%= link_to (h message.author.login), message.author %></td>
<td><%= link_to (h message.receiver.login), message.receiver %></td>
<td><%=h message.created_at.format :lang => current_user.language, :format => :long %></td>
<td><%=h message.created_at.format :lang => current_language, :format => :long %></td>
<td><%= link_to (l :destroy), message, :confirm => (l :are_you_sure?), :method => :delete %></td>
</tr>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/messages/show.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<p>
<b>Date:</b>
<%=h @message.created_at.format :lang => current_user.language, :format => :long %>
<%=h @message.created_at.format :lang => current_language, :format => :long %>
</p>

<p>
Expand Down
4 changes: 2 additions & 2 deletions src/app/views/project_memberships/_membership_info.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</tr>
<tr>
<td class="title"><%= l :created_at %></td>
<td class="value"><%= @membership.project.created_at.format :lang => current_user.language %></td>
<td class="value"><%= @membership.project.created_at.format :lang => current_language %></td>
</tr>
<tr>
<td class="title"><%= l :updated_at %></td>
<td class="value"><%= @membership.project.updated_at.format :lang => current_user.language %></td>
<td class="value"><%= @membership.project.updated_at.format :lang => current_language %></td>
</tr>
<tr>
<td class="title"><%= l :project_members %></td>
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/project_memberships/index.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<td><%=h project_membership.user.login %></td>
<td><%=h project_membership.project.name %></td>
<td><%=h project_membership.user_level %></td>
<td><%=h project_membership.created_at.format :lang => current_user.language, :format => :long %></td>
<td><%=h project_membership.created_at.format :lang => current_language, :format => :long %></td>
<td><%= link_to 'Show', project_membership %></td>
<td><%= link_to 'Edit', edit_project_membership_path(project_membership) %></td>
<td><%= link_to 'Destroy', project_membership, :confirm => 'Are you sure?', :method => :delete %></td>
Expand Down
4 changes: 2 additions & 2 deletions src/app/views/projects/_project_info.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</tr>
<tr>
<td class="title"><%= l :created_at %></td>
<td class="value"><%= @project.created_at.format :lang => current_user.language, :format => %></td>
<td class="value"><%= @project.created_at.format :lang => current_language, :format => %></td>
</tr>
<tr>
<td class="title"><%= l :updated_at %></td>
<td class="value"><%= @project.updated_at.format :lang => current_user.language, :format => %></td>
<td class="value"><%= @project.updated_at.format :lang => current_language, :format => %></td>
</tr>
<tr>
<td class="title"><%= l :project_members %></td>
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/projects/_project_list.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%= link_to project.name, :controller => :projects, :action => :show, :id => project.id %>
</div>
<div style="float:right;font-size:90%;padding-top:0.5em">
<%= project.updated_at.format :lang => current_user.language %>
<%= project.updated_at.format :lang => current_language %>
</div>
</div>
<div id="body" style="display:block">
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/users/_auto_complete_results.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<% for user in @users do -%>
<li class="user">
<div style="text-align:left"><%= link_to (h user.login), :action => "show", :id => user %></div>
<div style="text-align:left">Dabei seit: <%= h user.created_at.format :lang => current_user.language %></div>
<div style="text-align:left">Dabei seit: <%= h user.created_at.format :lang => current_language %></div>
</li>
<% end -%>
</ul>
2 changes: 1 addition & 1 deletion src/app/views/users/show.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</tr>
<tr>
<td class="title"><%= l :member_since %></td>
<td class="value"><%= @profile_user.created_at.format :lang => current_user.language, :format => :long %></td>
<td class="value"><%= @profile_user.created_at.format :lang => current_language, :format => :long %></td>
</tr>
</table>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/time_enhancement.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ def format(options = {})
format = options[:format]

output = case lang
when "de"
when :de
german(format)
when "en"
when :en
english(format)
end
end
Expand Down

0 comments on commit 360a08d

Please sign in to comment.