Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-19 16:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for failed tests

Browse source
This commit is contained in:
Marcus Ilgner 2011-01-16 18:26:00 +01:00
parent 338d4bb5a6
commit a7998ba40a
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -53,7 +53,7 @@ class ApplicationController < ActionController::Base
locale = params[:locale] # specifying a locale in the request takes precedence locale = params[:locale] # specifying a locale in the request takes precedence
locale = locale || prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over locale = locale || prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over
locale = locale || request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE'] locale = locale || request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE']
I18n.locale = I18n::available_locales.include?(locale.to_sym) ? locale : I18n.default_locale I18n.locale = locale.nil? ? I18n.default_locale : (I18n::available_locales.include?(locale.to_sym) ? locale : I18n.default_locale)
logger.debug("Selected '#{I18n.locale}' as locale") logger.debug("Selected '#{I18n.locale}' as locale")
end end

2
app/controllers/todos_controller.rb
View file

@ -813,7 +813,7 @@ class TodosController < ApplicationController
end end
def with_parent_resource_scope(&block) def with_parent_resource_scope(&block)
@feed_title = t('todos.feed_title') @feed_title = t('common.actions')
if (params[:context_id]) if (params[:context_id])
@context = current_user.contexts.find_by_params(params) @context = current_user.contexts.find_by_params(params)
@feed_title = @feed_title + t('todos.feed_title_in_context', :context => @context.name) @feed_title = @feed_title + t('todos.feed_title_in_context', :context => @context.name)

2
config/locales/en.yml
View file

@ -1,3 +1,4 @@
en:
activerecord: activerecord:
errors: errors:
models: models:
@ -473,7 +474,6 @@
due_date: "with a due date {{due_date}} or earlier" due_date: "with a due date {{due_date}} or earlier"
completed: "in the last {{count}} days" completed: "in the last {{count}} days"
feed_title_in_context: "in context '{{context}}'" feed_title_in_context: "in context '{{context}}'"
feed_title: "Actions"
feed_title_in_project: "in project '{{project}}'" feed_title_in_project: "in project '{{project}}'"
list_incomplete_next_actions_with_limit: "Lists the last {{count}} incomplete next actions" list_incomplete_next_actions_with_limit: "Lists the last {{count}} incomplete next actions"
list_incomplete_next_actions: "Lists incomplete next actions" list_incomplete_next_actions: "Lists incomplete next actions"