diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index c48a0a0..979f056 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -33,7 +33,7 @@ class LoginController < ApplicationController def logout reset_session - flash["status"] = _('User successfully logged out') + flash["status"] = t(:user_logged_out) redirect_to :action => "index" end diff --git a/app/controllers/webmail_controller.rb b/app/controllers/webmail_controller.rb index 7349cf5..7cb0784 100644 --- a/app/controllers/webmail_controller.rb +++ b/app/controllers/webmail_controller.rb @@ -9,15 +9,12 @@ class WebmailController < ApplicationController # Administrative functions before_filter :login_required - before_filter :obtain_cookies_for_search_and_nav, :only=>[:messages] + before_filter :load_imap_session + after_filter :close_imap_session layout "public", :except => [:view_source, :download] - before_filter :load_imap_session - - after_filter :close_imap_session - # model :filter, :expression, :mail_pref, :customer BOOL_ON = "on" @@ -70,10 +67,10 @@ class WebmailController < ApplicationController session['lsort'] = sort_query = params["scc"] session['tsort'][sort_query] = (session['tsort'][sort_query]? false : true) @search_field, @search_value = session['search_field'], session['search_value'] - when _('Search') # search + when t(:search) # search session['search_field'] = @search_field session['search_value'] = @search_value - when _('Show all') # search + when t(:show_all) # search session['search_field'] = @search_field = nil session['search_value'] = @search_value = nil else @@ -175,9 +172,9 @@ class WebmailController < ApplicationController get_parts(mail).each { |part| return send_part(part) if part.header and part.header['content-type']['name'] == params['ctype'] } - render("webmail/webmail/noattachment") + render("webmail/noattachment") else - render("webmail/webmail/noattachment") + render("webmail/noattachment") end end diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb index 43a7549..3303632 100644 --- a/app/helpers/navigation_helper.rb +++ b/app/helpers/navigation_helper.rb @@ -24,7 +24,7 @@ module NavigationHelper end def link_import_preview() "/contacts/import_preview" end - def link_main_index() "/" end + def link_main_index() root_url end def link_contact_import() "/contacts/import" end def link_contact_choose() "/contacts/contact/choose" end @@ -45,7 +45,7 @@ module NavigationHelper end def link_folders - link_to( t(:folders), :controller=>"/webmail", :action=>"messages") + link_to( t(:folders), :controller=>:webmail, :action=>:messages) end private diff --git a/app/helpers/webmail_helper.rb b/app/helpers/webmail_helper.rb index ab0bcbc..bbea329 100644 --- a/app/helpers/webmail_helper.rb +++ b/app/helpers/webmail_helper.rb @@ -159,6 +159,6 @@ module WebmailHelper def empty_trash_link(folder_name) link_to( "(#{t :empty})", { :controller => "webmail", :action => "empty", :params=>{"folder_name"=>folder_name}}, - :confirm => _('Do you really want to empty trash?')) + :confirm => t(:want_to_empty_trash_message)) end end diff --git a/app/views/layouts/chooser.html.erb b/app/views/layouts/chooser.html.erb new file mode 100644 index 0000000..7cccee7 --- /dev/null +++ b/app/views/layouts/chooser.html.erb @@ -0,0 +1,16 @@ + + +
+