Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-20 07:56:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2014-01-07 21:01:55 +01:00
parent fa537fbeb0
commit eb1502d4e0
28 changed files with 385 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/application.rb
View file

@ -68,5 +68,8 @@ module Tracksapp
config.action_view.sanitized_allowed_protocols = 'onenote', 'message'
config.middleware.insert_after ActionDispatch::ParamsParser, ActionDispatch::XmlParamsParser
# if a locale is invalid, the Rails app will raise an error
config.i18n.enforce_available_locales = true
end
end

3
config/locales/en.yml
View file

@ -471,6 +471,9 @@ en:
project_completed: Completed actions in this project
context_completed: Completed actions in this context
tag_hidden: "Hidden actions tagged with '%{param}'"
error:
invalid_due_date: "Invalid due date"
invalid_show_from_date: "Invalid show from date"
completed_today: Completed today
completed_rest_of_week: Completed in the rest of this week
completed_rest_of_month: Completed in the rest of this month