mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-26 03:58:49 +01:00
Merge branch 'master' into new-gui
Conflicts: Gemfile.lock app/assets/stylesheets/tracks.css.scss app/controllers/todos_controller.rb app/services/rich_message_extractor.rb app/services/todo_from_rich_message.rb app/views/todos/all_done.html.erb config/initializers/rack-mini-profiler.rb test/models/rich_message_extractor_test.rb test/models/todo_from_rich_message_test.rb
This commit is contained in:
Reinier Balt
commit
899df1ef8f
33 changed files with 1487 additions and 1313 deletions
18
Gemfile
18
Gemfile
|
|
@ -6,7 +6,7 @@ gem 'coffee-rails', '~>4.0.0'
|
|||
|
||||
gem 'json'
|
||||
|
||||
# todo: remove xml api
|
||||
# todo: remove xml api
|
||||
gem 'actionpack-xml_parser', git: 'https://github.com/rails/actionpack-xml_parser'
|
||||
|
||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||
|
|
@ -25,7 +25,7 @@ gem 'twitter-bootstrap-rails'
|
|||
#gem 'twitter-bootstrap-rails', github: 'seyhunak/twitter-bootstrap-rails', branch: "master"
|
||||
|
||||
# you may comment out the database driver you will not be using.
|
||||
# This will prevent a native build of the driver. Building native drivers is not
|
||||
# This will prevent a native build of the driver. Building native drivers is not
|
||||
# always possible on all hosters
|
||||
gem "sqlite3"
|
||||
gem "mysql2"
|
||||
|
|
@ -42,7 +42,7 @@ gem "htmlentities"
|
|||
gem "swf_fu"
|
||||
gem "rails_autolink"
|
||||
gem "cache_digests"
|
||||
gem "rack-mini-profiler"
|
||||
gem "highline" # for reset_password rake task
|
||||
|
||||
# To use ActiveModel has_secure_password
|
||||
gem 'bcrypt-ruby', '~> 3.0.0'
|
||||
|
|
@ -55,8 +55,10 @@ gem 'turbolinks'
|
|||
|
||||
group :development do
|
||||
gem "yard"
|
||||
gem "tolk"
|
||||
gem "tolk", git: 'https://github.com/tolk/tolk'
|
||||
gem 'protected_attributes' # needed for tolk. remove when tolk updates
|
||||
gem "bullet"
|
||||
gem "rack-mini-profiler"
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -70,13 +72,13 @@ group :test do
|
|||
gem "aruba", git: 'https://github.com/cucumber/aruba', :require => false # need 0.5.4 for piping files; 0.5.3 is latest
|
||||
gem "timecop", "~> 0.6.2"
|
||||
|
||||
# Note that > 2.14 has problems, see:
|
||||
# Note that > 2.14 has problems, see:
|
||||
# https://code.google.com/p/selenium/issues/detail?id=3075
|
||||
gem "selenium-webdriver"
|
||||
|
||||
gem "selenium-webdriver"
|
||||
|
||||
# uncomment to use the webkit option. This depends on Qt being installed
|
||||
# gem "capybara-webkit"
|
||||
|
||||
|
||||
# uncomment to be able to make screenshots from scenarios
|
||||
#gem "capybara-screenshot"
|
||||
#gem "launchy"
|
||||
|
|
|
|||
148
Gemfile.lock
148
Gemfile.lock
|
|
@ -1,8 +1,12 @@
|
|||
GIT
|
||||
remote: https://github.com/cucumber/aruba
|
||||
<<<<<<< HEAD
|
||||
revision: 7afbc5c0cbae9c9a946d70c4c2735ccb86e00f08
|
||||
=======
|
||||
revision: 99d8e6a5992af17b014783e775409bc3fd422273
|
||||
>>>>>>> master
|
||||
specs:
|
||||
aruba (0.5.3)
|
||||
aruba (0.5.4)
|
||||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
rspec-expectations (>= 2.7.0)
|
||||
|
|
@ -13,21 +17,42 @@ GIT
|
|||
specs:
|
||||
actionpack-xml_parser (1.0.1)
|
||||
actionpack (>= 4.0.0, < 5)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
GIT
|
||||
remote: https://github.com/tolk/tolk
|
||||
revision: da2888c181493027a68f04ba7e2b9060883cc464
|
||||
specs:
|
||||
tolk (1.4.00)
|
||||
safe_yaml (~> 0.8)
|
||||
will_paginate
|
||||
>>>>>>> master
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.2.9)
|
||||
<<<<<<< HEAD
|
||||
aasm (3.0.25)
|
||||
actionmailer (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
=======
|
||||
aasm (3.1.1)
|
||||
actionmailer (4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
>>>>>>> master
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
<<<<<<< HEAD
|
||||
activemodel (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
builder (~> 3.1.0)
|
||||
|
|
@ -38,18 +63,38 @@ GEM
|
|||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.2)
|
||||
=======
|
||||
activemodel (4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.3)
|
||||
activemodel (= 4.0.3)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.3)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.3)
|
||||
>>>>>>> master
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
acts_as_list (0.3.0)
|
||||
acts_as_list (0.4.0)
|
||||
activerecord (>= 3.0)
|
||||
<<<<<<< HEAD
|
||||
arel (4.0.1)
|
||||
atomic (1.1.14)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
bullet (4.7.1)
|
||||
=======
|
||||
arel (4.0.2)
|
||||
atomic (1.1.15)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
bullet (4.8.0)
|
||||
>>>>>>> master
|
||||
activesupport
|
||||
uniform_notifier (>= 1.4.0)
|
||||
cache_digests (0.3.1)
|
||||
|
|
@ -61,9 +106,13 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
childprocess (0.3.9)
|
||||
childprocess (0.5.1)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
<<<<<<< HEAD
|
||||
codeclimate-test-reporter (0.2.0)
|
||||
=======
|
||||
codeclimate-test-reporter (0.3.0)
|
||||
>>>>>>> master
|
||||
simplecov (>= 0.7.1, < 1.0.0)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
|
|
@ -71,9 +120,14 @@ GEM
|
|||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
<<<<<<< HEAD
|
||||
coffee-script-source (1.6.3)
|
||||
commonjs (0.2.7)
|
||||
cucumber (1.3.10)
|
||||
=======
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.3.11)
|
||||
>>>>>>> master
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
gherkin (~> 2.12)
|
||||
|
|
@ -86,6 +140,7 @@ GEM
|
|||
rails (>= 3.0.0)
|
||||
database_cleaner (1.2.0)
|
||||
diff-lcs (1.2.5)
|
||||
<<<<<<< HEAD
|
||||
docile (1.1.1)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
|
|
@ -93,13 +148,24 @@ GEM
|
|||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.3.0)
|
||||
factory_girl (~> 4.3.0)
|
||||
=======
|
||||
docile (1.1.3)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
factory_girl (4.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.4.1)
|
||||
factory_girl (~> 4.4.0)
|
||||
>>>>>>> master
|
||||
railties (>= 3.0.0)
|
||||
ffi (1.9.3)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
htmlentities (4.3.1)
|
||||
i18n (0.6.9)
|
||||
<<<<<<< HEAD
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
|
|
@ -109,16 +175,27 @@ GEM
|
|||
less-rails (2.4.2)
|
||||
actionpack (>= 3.1)
|
||||
less (~> 2.4.0)
|
||||
=======
|
||||
jquery-rails (3.1.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
>>>>>>> master
|
||||
libv8 (3.16.14.3)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
<<<<<<< HEAD
|
||||
metaclass (0.0.1)
|
||||
=======
|
||||
metaclass (0.0.4)
|
||||
>>>>>>> master
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.5.2)
|
||||
minitest (4.7.5)
|
||||
mocha (0.14.0)
|
||||
mocha (1.0.0)
|
||||
metaclass (~> 0.0.1)
|
||||
<<<<<<< HEAD
|
||||
mousetrap-rails (1.4.6)
|
||||
multi_json (1.8.2)
|
||||
multi_test (0.0.3)
|
||||
|
|
@ -126,6 +203,14 @@ GEM
|
|||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
polyglot (0.3.3)
|
||||
=======
|
||||
multi_json (1.8.4)
|
||||
multi_test (0.0.3)
|
||||
mysql2 (0.3.15)
|
||||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
polyglot (0.3.4)
|
||||
>>>>>>> master
|
||||
protected_attributes (1.0.5)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
rack (1.5.2)
|
||||
|
|
@ -133,6 +218,7 @@ GEM
|
|||
rack (>= 1.1.3)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
<<<<<<< HEAD
|
||||
rails (4.0.2)
|
||||
actionmailer (= 4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
|
|
@ -146,23 +232,51 @@ GEM
|
|||
railties (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
=======
|
||||
rails (4.0.3)
|
||||
actionmailer (= 4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
activerecord (= 4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.3)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
rails_autolink (1.1.5)
|
||||
rails (> 3.1)
|
||||
railties (4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
>>>>>>> master
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.1)
|
||||
ref (1.0.5)
|
||||
<<<<<<< HEAD
|
||||
rspec-expectations (2.14.4)
|
||||
=======
|
||||
rspec-expectations (2.14.5)
|
||||
>>>>>>> master
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rubyzip (1.1.0)
|
||||
safe_yaml (0.9.7)
|
||||
sanitize (2.0.6)
|
||||
sanitize (2.1.0)
|
||||
nokogiri (>= 1.4.4)
|
||||
<<<<<<< HEAD
|
||||
sass (3.2.13)
|
||||
=======
|
||||
sass (3.2.14)
|
||||
>>>>>>> master
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
<<<<<<< HEAD
|
||||
selenium-webdriver (2.39.0)
|
||||
childprocess (>= 0.2.5)
|
||||
=======
|
||||
selenium-webdriver (2.40.0)
|
||||
childprocess (>= 0.5.0)
|
||||
>>>>>>> master
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0.4)
|
||||
|
|
@ -171,7 +285,11 @@ GEM
|
|||
multi_json
|
||||
simplecov-html (~> 0.8.0)
|
||||
simplecov-html (0.8.0)
|
||||
<<<<<<< HEAD
|
||||
sprockets (2.10.1)
|
||||
=======
|
||||
sprockets (2.11.0)
|
||||
>>>>>>> master
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
|
|
@ -180,18 +298,19 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sqlite3 (1.3.8)
|
||||
sqlite3 (1.3.9)
|
||||
swf_fu (2.0.4)
|
||||
coffee-script
|
||||
rails (>= 3.1)
|
||||
therubyracer (0.12.0)
|
||||
therubyracer (0.12.1)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.3)
|
||||
atomic
|
||||
thread_safe (0.2.0)
|
||||
atomic (>= 1.1.7, < 2)
|
||||
tilt (1.4.1)
|
||||
timecop (0.6.3)
|
||||
<<<<<<< HEAD
|
||||
tolk (1.4.00)
|
||||
protected_attributes
|
||||
safe_yaml (~> 0.8)
|
||||
|
|
@ -206,6 +325,11 @@ GEM
|
|||
execjs
|
||||
rails (>= 3.1)
|
||||
railties (>= 3.1)
|
||||
=======
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
>>>>>>> master
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.4.0)
|
||||
execjs (>= 0.3.0)
|
||||
|
|
@ -237,6 +361,7 @@ DEPENDENCIES
|
|||
cucumber-rails
|
||||
database_cleaner
|
||||
factory_girl_rails
|
||||
highline
|
||||
htmlentities
|
||||
jquery-rails
|
||||
json
|
||||
|
|
@ -244,6 +369,7 @@ DEPENDENCIES
|
|||
mocha
|
||||
mousetrap-rails
|
||||
mysql2
|
||||
protected_attributes
|
||||
rack-mini-profiler
|
||||
rails (~> 4.0.0)
|
||||
rails_autolink
|
||||
|
|
@ -256,9 +382,13 @@ DEPENDENCIES
|
|||
swf_fu
|
||||
therubyracer
|
||||
timecop (~> 0.6.2)
|
||||
<<<<<<< HEAD
|
||||
tolk
|
||||
turbolinks
|
||||
twitter-bootstrap-rails
|
||||
=======
|
||||
tolk!
|
||||
>>>>>>> master
|
||||
uglifier (>= 1.3.0)
|
||||
will_paginate-bootstrap
|
||||
yard
|
||||
|
|
|
|||
|
|
@ -211,4 +211,4 @@ form#todo-form-new-action {
|
|||
|
||||
div.hide_me {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
def all_done_todos_for(object)
|
||||
object_name = object.class.name.downcase # context or project
|
||||
@source_view = object_name
|
||||
@source_view = "all_done"
|
||||
@page_title = t("#{object_name.pluralize}.all_completed_tasks_title", "#{object_name}_name".to_sym => object.name)
|
||||
|
||||
@done = object.todos.completed.reorder('completed_at DESC').includes(Todo::DEFAULT_INCLUDES).
|
||||
|
|
@ -280,11 +280,11 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
def done_todos_for(object)
|
||||
object_name = object.class.name.downcase # context or project
|
||||
@source_view = object_name
|
||||
@source_view = "done"
|
||||
eval("@#{object_name} = object")
|
||||
@page_title = t("#{object_name.pluralize}.completed_tasks_title", "#{object_name}_name".to_sym => object.name)
|
||||
|
||||
@done_today, @done_rest_of_week, @done_rest_of_month = DoneTodos.done_todos_for_container(object)
|
||||
@done_today, @done_rest_of_week, @done_rest_of_month = DoneTodos.done_todos_for_container(object.todos)
|
||||
@count = @done_today.size + @done_rest_of_week.size + @done_rest_of_month.size
|
||||
|
||||
render :template => 'todos/done'
|
||||
|
|
|
|||
|
|
@ -524,7 +524,7 @@ class TodosController < ApplicationController
|
|||
@source_view = 'done'
|
||||
@page_title = t('todos.completed_tasks_title')
|
||||
|
||||
@done_today, @done_rest_of_week, @done_rest_of_month = DoneTodos.done_todos_for_container(current_user)
|
||||
@done_today, @done_rest_of_week, @done_rest_of_month = DoneTodos.done_todos_for_container(current_user.todos)
|
||||
@count = @done_today.size + @done_rest_of_week.size + @done_rest_of_month.size
|
||||
|
||||
respond_to do |format|
|
||||
|
|
@ -678,7 +678,7 @@ class TodosController < ApplicationController
|
|||
end
|
||||
|
||||
def done_by_tag_setup
|
||||
@source_view = params['_source_view'] || 'tag'
|
||||
@source_view = params['_source_view'] || 'done'
|
||||
@tag_name = sanitize(params[:name]) # sanitize to prevent XSS vunerability!
|
||||
@page_title = t('todos.all_completed_tagged_page_title', :tag_name => @tag_name)
|
||||
@tag = Tag.where(:name => @tag_name).first_or_create
|
||||
|
|
@ -769,7 +769,11 @@ class TodosController < ApplicationController
|
|||
@items = get_not_completed_for_predecessor(current_user, @todo.id) unless !@items.empty?
|
||||
else
|
||||
# New todo - TODO: Filter on current project in project view
|
||||
<<<<<<< HEAD
|
||||
@items = get_not_complete_for_predecessor(current_user)
|
||||
=======
|
||||
@items = get_not_completed_for_predecessor(current_user)
|
||||
>>>>>>> master
|
||||
end
|
||||
render :inline => format_dependencies_as_json_for_auto_complete(@items)
|
||||
end
|
||||
|
|
@ -1010,7 +1014,10 @@ end
|
|||
@target_context_count = actions_in_target.count
|
||||
}
|
||||
from.done {
|
||||
@remaining_in_context = DoneTodos.remaining_in_container(current_user, @original_completed_period)
|
||||
@remaining_in_context = DoneTodos.remaining_in_container(current_user.todos, @original_completed_period)
|
||||
}
|
||||
from.all_done {
|
||||
@remaining_in_context = current_user.todos.completed.count
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
@ -1271,18 +1278,18 @@ end
|
|||
completed_todos.completed_after(start_of_this_day).includes(includes[:include])
|
||||
end
|
||||
|
||||
def get_done_in_period(before, after, includes = {:include => Todo::DEFAULT_INCLUDES})
|
||||
def get_done_in_period(completed_todos, before, after, includes = {:include => Todo::DEFAULT_INCLUDES})
|
||||
completed_todos.completed_before(before).completed_after(after).includes(includes[:include])
|
||||
end
|
||||
|
||||
# all completed todos [begin_of_week, start_of_today]
|
||||
def get_done_rest_of_week(completed_todos, includes = {:include => Todo::DEFAULT_INCLUDES})
|
||||
get_done_in_period(Time.zone.now.beginning_of_day, Time.zone.now.beginning_of_week)
|
||||
get_done_in_period(completed_todos, Time.zone.now.beginning_of_day, Time.zone.now.beginning_of_week)
|
||||
end
|
||||
|
||||
# all completed todos [begin_of_month, begin_of_week]
|
||||
def get_done_rest_of_month(completed_todos, includes = {:include => Todo::DEFAULT_INCLUDES})
|
||||
get_done_in_period(Time.zone.now.beginning_of_week, Time.zone.now.beginning_of_month)
|
||||
get_done_in_period(completed_todos, Time.zone.now.beginning_of_week, Time.zone.now.beginning_of_month)
|
||||
end
|
||||
|
||||
def get_not_done_todos
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ module ApplicationHelper
|
|||
when "projects"
|
||||
send("#{type}_todos_project_path", @project)
|
||||
when "todos"
|
||||
if source_view_is(:tag)
|
||||
if @tag_name
|
||||
send("#{type}_tag_path",@tag_name)
|
||||
else
|
||||
send("#{type}_todos_path")
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ module TodosHelper
|
|||
)
|
||||
end
|
||||
|
||||
return false if source_view_is_one_of(:calendar, :done)
|
||||
return false if source_view_is_one_of(:calendar, :done, :all_done)
|
||||
|
||||
return @remaining_in_context == 0
|
||||
end
|
||||
|
|
@ -682,6 +682,7 @@ module TodosHelper
|
|||
}
|
||||
page.todo { container_id = context_container_empty_id(@original_item) if @remaining_in_context == 0 }
|
||||
page.done { container_id = "completed_#{@original_completed_period}_container-empty-d" if @remaining_in_context == 0 }
|
||||
page.all_done { container_id = "all-done-empty-nd" if @remaining_in_context == 0 }
|
||||
end
|
||||
return container_id.blank? ? "" : "$(\"##{container_id}\").slideDown(100);".html_safe
|
||||
end
|
||||
|
|
|
|||
|
|
@ -51,12 +51,12 @@ class RichMessageExtractor
|
|||
|
||||
def due
|
||||
due = select_for DUE_MARKER
|
||||
due.blank? ? nil : Date.parse(due[1].strip)
|
||||
due.blank? ? nil : Time.zone.parse(fix_date_string(due[1].strip))
|
||||
end
|
||||
|
||||
def show_from
|
||||
show_from = select_for TICKLER_MARKER
|
||||
show_from.blank? ? nil : Date.parse(show_from[1].strip)
|
||||
show_from.blank? ? nil : Time.zone.parse(fix_date_string(show_from[1].strip))
|
||||
end
|
||||
|
||||
def starred?
|
||||
|
|
@ -69,4 +69,8 @@ class RichMessageExtractor
|
|||
@message.match /#{symbol}(.*?)(?=[#{ALL_MARKERS.join}]|\Z)/
|
||||
end
|
||||
|
||||
def fix_date_string yymmdd
|
||||
"20#{yymmdd[0..1]}-#{yymmdd[2..3]}-#{yymmdd[4..5]} 00:00"
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ class TodoFromRichMessage
|
|||
todo.raw_notes = notes
|
||||
todo.context_id = context_id
|
||||
todo.project_id = project_id unless project_id.nil?
|
||||
todo.show_from = show_from if show_from.is_a? Date
|
||||
todo.due = due if due.is_a? Date
|
||||
todo.show_from = show_from if show_from.is_a? Time
|
||||
todo.due = due if due.is_a? Time
|
||||
todo.tag_with tags unless tags.nil? || tags.empty?
|
||||
todo.starred = star
|
||||
todo
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<meta name="mobile-web-app-capable" content="yes">
|
||||
<meta name="viewport" content="width=device-width, user-scalable=no">
|
||||
<%= stylesheet_link_tag "mobile", :media => 'handheld,all' %>
|
||||
<%= favicon_link_tag 'favicon.ico' %>
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@
|
|||
<%= render :partial => "todos/todo", :collection => @done, :locals => { :parent_container_type => "completed", :suppress_context => false, :suppress_project => false } %>
|
||||
<% end -%>
|
||||
|
||||
<div class="paginate_footer"><%= will_paginate @done, paginate_options %></div>
|
||||
<div class="paginate_footer"><%= will_paginate @done, paginate_options %></div>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ cs:
|
|||
first_name: Jméno
|
||||
last_name: Příjmení
|
||||
locale: Lokále
|
||||
mobile_todos_per_page: Úkolů na stránku (mobilní zobrazení)
|
||||
mobile_todos_per_page: "Úkolů na stránku (mobilní zobrazení)"
|
||||
refresh: Interval obnovení stránky (v minutách)
|
||||
review_period: Interval revize projektů
|
||||
show_completed_projects_in_sidebar: Zobrazovat hotové projekty v sidebaru
|
||||
|
|
@ -22,7 +22,7 @@ cs:
|
|||
sms_context: Výchozí emailový kontext
|
||||
sms_email: SMS email
|
||||
staleness_starts: Jako prošlé označit projekty starší než
|
||||
time_zone: Časové pásmo
|
||||
time_zone: "Časové pásmo"
|
||||
title_date_format: Formát data nadpisu
|
||||
verbose_action_descriptors: Ukecané popisovače úkolů
|
||||
week_starts: Začátek týdne
|
||||
|
|
@ -45,7 +45,7 @@ cs:
|
|||
last_name: Jméno
|
||||
errors:
|
||||
full_messages:
|
||||
format: '%{attribute} %{message}'
|
||||
format: "%{attribute} %{message}"
|
||||
messages:
|
||||
accepted: musí být akceptováno
|
||||
blank: nesmí být prázdné
|
||||
|
|
@ -78,14 +78,14 @@ cs:
|
|||
body: 'Nastaly potíže s následujícími políčky:'
|
||||
header:
|
||||
one: jedna chyba brání uložení tohoto objektu %{model}
|
||||
other: '%{count} chyb brání uložení tohoto objektu %{model}'
|
||||
other: "%{count} chyb brání uložení tohoto objektu %{model}"
|
||||
common:
|
||||
action: Úkol
|
||||
actions: Úkoly
|
||||
action: "Úkol"
|
||||
actions: "Úkoly"
|
||||
actions_midsentence:
|
||||
one: úkolů
|
||||
other: Úkoly
|
||||
zero: Úkoly
|
||||
one: "úkolů"
|
||||
other: "Úkoly"
|
||||
zero: "Úkoly"
|
||||
add: Přidat
|
||||
ajaxError: Chyba čtení ze serveru
|
||||
back: Zpět
|
||||
|
|
@ -105,19 +105,19 @@ cs:
|
|||
email: Email
|
||||
errors_with_fields: 'Nastaly potíže s následujícími políčky:'
|
||||
first: První
|
||||
forth: Čtvrtý
|
||||
fourth: Čtvrtý
|
||||
forth: "Čtvrtý"
|
||||
fourth: "Čtvrtý"
|
||||
go_back: Zpět
|
||||
last: Poslední
|
||||
logout: Odhlásit
|
||||
month: měsíc
|
||||
months: měsíce
|
||||
next: Další
|
||||
none: Žádný
|
||||
none: "Žádný"
|
||||
not_available_abbr: n/a
|
||||
note:
|
||||
one: 1 na vědomí
|
||||
other: '%{count} na vědomy'
|
||||
other: "%{count} na vědomy"
|
||||
zero: 0 na vědomí
|
||||
notes: Poznámky
|
||||
numbered_step: Krok %{number}
|
||||
|
|
@ -138,12 +138,12 @@ cs:
|
|||
pořadí bude ztraceno.
|
||||
alphabetically_title: Seřadit projekty abecedně
|
||||
by_task_count: Podle počtu úkolů
|
||||
by_task_count_title: Řadit podle počtu úkolů
|
||||
by_task_count_title: "Řadit podle počtu úkolů"
|
||||
by_task_count_title_confirm: Určitě chcete řadit tyto projekty podle počtu úkolů?
|
||||
Stávající pořadí bude ztraceno.
|
||||
sort: Řadit
|
||||
sort: "Řadit"
|
||||
third: Třetí
|
||||
todo: úkol
|
||||
todo: "úkol"
|
||||
update: Uložit
|
||||
website: Webová stránka
|
||||
week: týden
|
||||
|
|
@ -165,10 +165,10 @@ cs:
|
|||
hide_form: Schovat formulář
|
||||
hide_form_title: Schovat formulář
|
||||
last_completed_in_context: v tomto kontextu (posledních %{number})
|
||||
new_context_post: ''' bude také vytvořen. Opravdu?'
|
||||
new_context_post: "' bude také vytvořen. Opravdu?"
|
||||
new_context_pre: Nový kontext '
|
||||
no_contexts_active: Žádné aktivní kontexty
|
||||
no_contexts_hidden: Žádné skryté kontexty
|
||||
no_contexts_active: "Žádné aktivní kontexty"
|
||||
no_contexts_hidden: "Žádné skryté kontexty"
|
||||
save_status_message: Kontext uložen
|
||||
show_form: Nový kontext
|
||||
show_form_title: Nový kontext
|
||||
|
|
@ -184,55 +184,55 @@ cs:
|
|||
abbr_day_names:
|
||||
- Ne
|
||||
- Po
|
||||
- Út
|
||||
- "Út"
|
||||
- St
|
||||
- Čt
|
||||
- "Čt"
|
||||
- Pá
|
||||
- So
|
||||
abbr_month_names:
|
||||
-
|
||||
- Led
|
||||
- Úno
|
||||
- "Úno"
|
||||
- Bře
|
||||
- Dub
|
||||
- Kvě
|
||||
- Čer
|
||||
- Čec
|
||||
- "Čer"
|
||||
- "Čec"
|
||||
- Srp
|
||||
- Zář
|
||||
- Říj
|
||||
- "Říj"
|
||||
- Lis
|
||||
- Pro
|
||||
day_names:
|
||||
- Neděle
|
||||
- Ponělí
|
||||
- Úterý
|
||||
- "Úterý"
|
||||
- Středa
|
||||
- Čtvrtek
|
||||
- "Čtvrtek"
|
||||
- Pátek
|
||||
- Sobota
|
||||
formats:
|
||||
default: '%Y-%m-%d'
|
||||
long: '%B %d, %Y'
|
||||
longer: '%A %B %d, %Y'
|
||||
short: '%b %d'
|
||||
default: "%Y-%m-%d"
|
||||
long: "%B %d, %Y"
|
||||
longer: "%A %B %d, %Y"
|
||||
short: "%b %d"
|
||||
month_names:
|
||||
-
|
||||
- Leden
|
||||
- Únor
|
||||
- "Únor"
|
||||
- Březen
|
||||
- Duben
|
||||
- Květen
|
||||
- Červen
|
||||
- Červenec
|
||||
- "Červen"
|
||||
- "Červenec"
|
||||
- Srpen
|
||||
- Září
|
||||
- Říjen
|
||||
- "Říjen"
|
||||
- Listopad
|
||||
- Prosinec
|
||||
order:
|
||||
- rok
|
||||
- ':měsíc'
|
||||
- ":měsíc"
|
||||
- den
|
||||
datetime:
|
||||
distance_in_words:
|
||||
|
|
@ -262,16 +262,16 @@ cs:
|
|||
other: přes %{count} let
|
||||
x_days:
|
||||
one: 1 den
|
||||
other: '%{count} dní'
|
||||
other: "%{count} dní"
|
||||
x_minutes:
|
||||
one: 1 minuta
|
||||
other: '%{count} minut'
|
||||
other: "%{count} minut"
|
||||
x_months:
|
||||
one: 1 měsíc
|
||||
other: '%{count} měsíců'
|
||||
other: "%{count} měsíců"
|
||||
x_seconds:
|
||||
one: 1 sekunda
|
||||
other: '%{count} sekund'
|
||||
other: "%{count} sekund"
|
||||
prompts:
|
||||
day: Den
|
||||
hour: Hodina
|
||||
|
|
@ -282,8 +282,8 @@ cs:
|
|||
errors:
|
||||
user_unauthorized: '401 Neautorizováno: Jen administrátoři smí používat tuto funkci.'
|
||||
feedlist:
|
||||
actions_completed_last_week: Úkoly dokončené v posledních sedmi dnech
|
||||
actions_due_next_week: Úkoly plánované na příštích sedm dní
|
||||
actions_completed_last_week: "Úkoly dokončené v posledních sedmi dnech"
|
||||
actions_due_next_week: "Úkoly plánované na příštích sedm dní"
|
||||
actions_due_today: Akce plánované na dnes
|
||||
active_projects_wo_next: Aktivni projekty bez úkolů
|
||||
active_starred_actions: Všechny aktivní úkoly s hvězdičkou
|
||||
|
|
@ -335,7 +335,7 @@ cs:
|
|||
export_title: Import a export dat
|
||||
feeds: Feedy
|
||||
feeds_title: Seznam dostupných feedů
|
||||
help: '?'
|
||||
help: "?"
|
||||
home: Domů
|
||||
home_title: Domů
|
||||
integrations_: Integrovat Tracks
|
||||
|
|
@ -375,7 +375,7 @@ cs:
|
|||
login_cas: přejít na CAS
|
||||
login_standard: vraťte se ke standardnímu přihlášení
|
||||
login_with_openid: přihlašte se se svým OpenID
|
||||
mobile_use_openid: …nebo přihlášení s OpenID
|
||||
mobile_use_openid: "…nebo přihlášení s OpenID"
|
||||
openid_identity_url_not_found: Je nám líto, neexistuje uživatel s touto identitou
|
||||
(%{identity_url})
|
||||
option_separator: nebo
|
||||
|
|
@ -411,8 +411,8 @@ cs:
|
|||
deleted_note: Smazat poznámku '%{id}'
|
||||
edit_item_title: Upravit položku
|
||||
in_project: 'V:'
|
||||
no_notes_available: 'Žádné poznámky: přidejte poznámky ze stránek jednotlivých
|
||||
projektů.'
|
||||
no_notes_available: "Žádné poznámky: přidejte poznámky ze stránek jednotlivých
|
||||
projektů."
|
||||
note_header: Poznámka %{id}
|
||||
note_link_title: Zobrazit poznámku %{id}
|
||||
note_location_link: 'V:'
|
||||
|
|
@ -420,20 +420,20 @@ cs:
|
|||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: ','
|
||||
format: '%u%n'
|
||||
delimiter: ","
|
||||
format: "%u%n"
|
||||
precision: 2
|
||||
separator: .
|
||||
unit: $
|
||||
separator: "."
|
||||
unit: "$"
|
||||
format:
|
||||
delimiter: ','
|
||||
delimiter: ","
|
||||
precision: 3
|
||||
separator: .
|
||||
separator: "."
|
||||
human:
|
||||
format:
|
||||
precision: 1
|
||||
storage_units:
|
||||
format: '%n %u'
|
||||
format: "%n %u"
|
||||
units:
|
||||
byte:
|
||||
one: Byte
|
||||
|
|
@ -459,7 +459,7 @@ cs:
|
|||
page_title_edit: TRACKS::Editace nastavení
|
||||
password_changed: Heslo bylo změněno. Prosím znovu se přihlašte.
|
||||
show_number_completed: Zobrazit %{number} hotových položek
|
||||
sms_context_none: žádný
|
||||
sms_context_none: "žádný"
|
||||
staleness_starts_after: Zastarání nastává po %{days} dnech
|
||||
tabs:
|
||||
authentication: Autentizace
|
||||
|
|
@ -471,7 +471,7 @@ cs:
|
|||
token_header: Váš pešek
|
||||
updated: Nastavení bylo uloženo
|
||||
projects:
|
||||
actions_in_project_title: Úkoly v tomto projetku
|
||||
actions_in_project_title: "Úkoly v tomto projetku"
|
||||
active_projects: Aktivní projekty
|
||||
add_note: Nová poznámka
|
||||
add_note_submit: Nová poznámka
|
||||
|
|
@ -496,12 +496,12 @@ cs:
|
|||
list_projects: TRACKS::Projekty
|
||||
list_reviews: TRACKS::Revize
|
||||
no_default_context: Tento projekt nemá výchozí kontext
|
||||
no_last_completed_projects: Žádné hotové projekty
|
||||
no_last_completed_recurring_todos: Žádné hotové opakované úkoly
|
||||
no_notes_attached: Žádné poznámky
|
||||
no_projects: Žádné projekty
|
||||
no_last_completed_projects: "Žádné hotové projekty"
|
||||
no_last_completed_recurring_todos: "Žádné hotové opakované úkoly"
|
||||
no_notes_attached: "Žádné poznámky"
|
||||
no_projects: "Žádné projekty"
|
||||
notes: Poznámky
|
||||
notes_empty: Žádné poznámky
|
||||
notes_empty: "Žádné poznámky"
|
||||
page_title: 'TRACKS::Projekt: %{project}'
|
||||
project_saved_status: Projekt byl uložen
|
||||
project_state: Projekt je %{state}.
|
||||
|
|
@ -534,7 +534,7 @@ cs:
|
|||
hide_action_form_title: Skrýt formulář pro založení nového úkolu
|
||||
hide_form: Schovat formulář
|
||||
make_actions_dependent: Akce budou vzájemně závislé
|
||||
multiple_next_actions: Úkoly (jeden na každém řádku)
|
||||
multiple_next_actions: "Úkoly (jeden na každém řádku)"
|
||||
project_for_all_actions: Projekt (pro všechny)
|
||||
separate_tags_with_commas: oddělené čárkami
|
||||
tags_for_all_actions: Značky (oddělené čárkami)
|
||||
|
|
@ -567,10 +567,10 @@ cs:
|
|||
visible: Viditelný
|
||||
visible_plural: Viditelné
|
||||
stats:
|
||||
action_completion_time_title: Čas dokončení (všechny hotové úkoly)
|
||||
action_completion_time_title: "Čas dokončení (všechny hotové úkoly)"
|
||||
action_selection_title: TRACKS::výběr úkolů
|
||||
actions: Úkoly
|
||||
actions_30days_title: Úkoly za posledních 30 dní
|
||||
actions: "Úkoly"
|
||||
actions_30days_title: "Úkoly za posledních 30 dní"
|
||||
actions_actions_avg_created_30days: Za posledních 30 dní bylo vytvořeno průměrně
|
||||
%{count} úkolů
|
||||
actions_avg_completed: a uzavřeno průměrně %{count} úkolů za měsíc.
|
||||
|
|
@ -587,15 +587,15 @@ cs:
|
|||
day_of_week: Den v týdnu
|
||||
number_of_actions: Počet akcí
|
||||
actions_dow_30days_title: Dny v týdnu (posleních 30 dní)
|
||||
actions_further: ' a dále'
|
||||
actions_last_year: Úkoly v posledním roce
|
||||
actions_further: a dále
|
||||
actions_last_year: "Úkoly v posledním roce"
|
||||
actions_last_year_legend:
|
||||
months_ago: měsíců zpět
|
||||
number_of_actions: Počet úklolů
|
||||
actions_lastyear_title: Úkoly za posledních 12 měsíců
|
||||
actions_lastyear_title: "Úkoly za posledních 12 měsíců"
|
||||
actions_min_completion_time: Minimální čas k dokončení je %{time}.
|
||||
actions_min_max_completion_days: Minimum/maximum dní na dokončení je %{min}/%{max}.
|
||||
actions_selected_from_week: 'Úkoly vybrané z týdne '
|
||||
actions_selected_from_week: "Úkoly vybrané z týdne"
|
||||
click_to_return: Klepněte %{link} pro návrat ke statistikám.
|
||||
click_to_return_link: zde
|
||||
click_to_show_actions_from_week: Klepněte %{link} pro zobrazení úkolů z týdne
|
||||
|
|
@ -610,34 +610,34 @@ cs:
|
|||
avg_created: průměrně vytvořeno
|
||||
completed: Completed
|
||||
created: Vytvořeno
|
||||
month_avg_completed: '%{months} měsíční průměr hotových'
|
||||
month_avg_created: '%{months} měsíční průměr vytvořených'
|
||||
month_avg_completed: "%{months} měsíční průměr hotových"
|
||||
month_avg_created: "%{months} měsíční průměr vytvořených"
|
||||
legend:
|
||||
actions: Úkoly
|
||||
actions: "Úkoly"
|
||||
day_of_week: Den v týdnu
|
||||
months_ago: měsíců zpět
|
||||
number_of_actions: Počet úkolů
|
||||
number_of_days: Před kolika dny
|
||||
percentage: Podíl
|
||||
running_time: Čas k dokončení úkolu (týdny)
|
||||
running_time: "Čas k dokončení úkolu (týdny)"
|
||||
more_stats_will_appear: Další statistiky se zobrazí až přibyde více úkolů.
|
||||
no_actions_selected: Nejsou vybrány žádné úkoly.
|
||||
no_tags_available: žádné štítky nejsou definovány
|
||||
no_tags_available: "žádné štítky nejsou definovány"
|
||||
open_per_week: Aktivní (viditelné i skryté) další akce za týden
|
||||
open_per_week_legend:
|
||||
actions: Akcí
|
||||
weeks: Týdny
|
||||
other_actions_label: (ostatní)
|
||||
other_actions_label: "(ostatní)"
|
||||
projects: Projekty
|
||||
running_time_all: Aktuální čas běhu všech nehotových úkolů
|
||||
running_time_all_legend:
|
||||
actions: Úkoly
|
||||
actions: "Úkoly"
|
||||
percentage: Podíl
|
||||
running_time: Čas běhu úkolů (týdny). Klepněte na sloupec pro další info
|
||||
running_time: "Čas běhu úkolů (týdny). Klepněte na sloupec pro další info"
|
||||
running_time_legend:
|
||||
actions: Úkoly
|
||||
actions: "Úkoly"
|
||||
percentage: Podíl
|
||||
weeks: Čas běhu úkolu (týdny). Klepněte na sloupec pro další info
|
||||
weeks: "Čas běhu úkolu (týdny). Klepněte na sloupec pro další info"
|
||||
spread_of_actions_for_all_context: Distribuce všech úkolů do kontextů
|
||||
spread_of_running_actions_for_visible_contexts: Distribuce běžících úkolů do viditelných
|
||||
kontextů
|
||||
|
|
@ -647,7 +647,7 @@ cs:
|
|||
tag_cloud_description: Tento mrak zahrnuje štítky všech úkolů (hotových, nehotových,
|
||||
viditelných i skrytých)
|
||||
tag_cloud_title: Mrak štítků pro všechny úkly
|
||||
tags: Štítky
|
||||
tags: "Štítky"
|
||||
time_of_day: Denní doba (všechny úkoly)
|
||||
time_of_day_legend:
|
||||
number_of_actions: Počet úkolů
|
||||
|
|
@ -664,15 +664,15 @@ cs:
|
|||
úkoly
|
||||
totals: Celkem
|
||||
totals_action_count: máte celkem %{count} úkolů
|
||||
totals_actions_completed: '%{count} z nich je hotových.'
|
||||
totals_actions_completed: "%{count} z nich je hotových."
|
||||
totals_active_project_count: Znich %{count} je aktivních projeků
|
||||
totals_blocked_actions: '%{count} je závislých na dokončení jiných akcí.'
|
||||
totals_blocked_actions: "%{count} je závislých na dokončení jiných akcí."
|
||||
totals_completed_project_count: a %{count} je hotových projektů.
|
||||
totals_context_count: Máte %{count} kontextů.
|
||||
totals_deferred_actions: z nichž %{count} jsou odložené úkoly v Ticlkeru
|
||||
totals_first_action: Od vašeho prvního úkolu %{date}
|
||||
totals_hidden_context_count: a %{count} skrytých kontextů.
|
||||
totals_hidden_project_count: '%{count} je skrytých'
|
||||
totals_hidden_project_count: "%{count} je skrytých"
|
||||
totals_incomplete_actions: Máte %{count} nehotových úkolů
|
||||
totals_project_count: Máte %{count} projektů.
|
||||
totals_tag_count: Na akcích je umístěno %{count} štítků.
|
||||
|
|
@ -681,37 +681,37 @@ cs:
|
|||
within_one: V rámci 1.
|
||||
support:
|
||||
array:
|
||||
last_word_connector: ', a '
|
||||
two_words_connector: ' a '
|
||||
words_connector: ', '
|
||||
last_word_connector: ", a"
|
||||
two_words_connector: a
|
||||
words_connector: ","
|
||||
select:
|
||||
prompt: Prosím vyberte
|
||||
time:
|
||||
am: am
|
||||
formats:
|
||||
default: '%a, %d %b %Y %H:%M:%S %z'
|
||||
long: '%B %d, %Y %H:%M'
|
||||
month_day: '%B %d'
|
||||
short: '%d %b %H:%M'
|
||||
stats: '%a %d-%m'
|
||||
default: "%a, %d %b %Y %H:%M:%S %z"
|
||||
long: "%B %d, %Y %H:%M"
|
||||
month_day: "%B %d"
|
||||
short: "%d %b %H:%M"
|
||||
stats: "%a %d-%m"
|
||||
pm: pm
|
||||
todos:
|
||||
action_deferred: Úkol '%{description}' byl oldožen
|
||||
action_deferred: "Úkol '%{description}' byl oldožen"
|
||||
action_deleted_error: Nepodařilo se smazat úkol
|
||||
action_deleted_success: Úkol byl úspěšně smazán
|
||||
action_due_on: (úkol plánován na %{date})
|
||||
action_marked_complete: Úkol <strong>'%{description}'</strong> byl označen jako
|
||||
<strong>%{completed}</strong>
|
||||
action_marked_complete_error: Úkol <strong>'%{description}'</strong> NEBYL označen
|
||||
jako <strong>%{completed} kvůli chybě na serveru.</strong>
|
||||
action_saved: Úkol uložen
|
||||
action_saved_to_tickler: Úkol byl uložen do Tickleru
|
||||
action_deleted_success: "Úkol byl úspěšně smazán"
|
||||
action_due_on: "(úkol plánován na %{date})"
|
||||
action_marked_complete: "Úkol <strong>'%{description}'</strong> byl označen jako
|
||||
<strong>%{completed}</strong>"
|
||||
action_marked_complete_error: "Úkol <strong>'%{description}'</strong> NEBYL označen
|
||||
jako <strong>%{completed} kvůli chybě na serveru.</strong>"
|
||||
action_saved: "Úkol uložen"
|
||||
action_saved_to_tickler: "Úkol byl uložen do Tickleru"
|
||||
add_another_dependency: Přidat další závislost
|
||||
add_new_recurring: Vytvořit opakovaný úkol
|
||||
added_dependency: Přidáno %{dependency} jako závislost.
|
||||
added_new_context: Přidán nový kontext
|
||||
added_new_next_action: Přidán nový úkol
|
||||
added_new_next_action_plural: Úkoly byly přidány
|
||||
added_new_next_action_plural: "Úkoly byly přidány"
|
||||
added_new_next_action_singular: Přidán nový úkol
|
||||
added_new_project: Přidán nový projekt
|
||||
all_completed: Všechny hotové úkoly
|
||||
|
|
@ -719,7 +719,7 @@ cs:
|
|||
all_completed_tagged_page_title: TRACKS::Hotové úkoly se štítkem %{tag_name}
|
||||
append_in_this_project: v tomto projektu
|
||||
archived_tasks_title: TRACKS::Archiv hotových úkolů
|
||||
blocked_by: Čeká na %{predecessors}
|
||||
blocked_by: "Čeká na %{predecessors}"
|
||||
calendar:
|
||||
due_next_week: Plánované příští týden
|
||||
due_this_month: Plánováno na %{month}
|
||||
|
|
@ -762,7 +762,7 @@ cs:
|
|||
delete_action: Smazat úkol
|
||||
delete_recurring_action_confirm: Opravdu chcete smazat opakovaný úkol '%{description}'?
|
||||
delete_recurring_action_title: Smazat opakovaný úkol
|
||||
deleted_success: Úkol byl úspěšně smazán.
|
||||
deleted_success: "Úkol byl úspěšně smazán."
|
||||
depends_on: Závisí na
|
||||
depends_on_separate_with_commas: Závisí na (odděleno čárkami)
|
||||
done: Hotovo?
|
||||
|
|
@ -787,9 +787,9 @@ cs:
|
|||
due: 'Plánováno na: %{date}'
|
||||
has_x_pending:
|
||||
one: Jeden čekající úkol
|
||||
other: '%{count} čekajících úkolů'
|
||||
other: "%{count} čekajících úkolů"
|
||||
hidden_actions: Skryté úkoly
|
||||
in_hidden_state: (skrytý)
|
||||
in_hidden_state: "(skrytý)"
|
||||
in_pending_state: ve stavu čekající
|
||||
list_incomplete_next_actions: Zabrazí nehotové úkoly
|
||||
list_incomplete_next_actions_with_limit: Zobrazuje posledních %{count} nedokončených
|
||||
|
|
@ -798,7 +798,7 @@ cs:
|
|||
new_related_todo_created: Byl vytvořen nový úkol patřící do tohoto opakovaného
|
||||
úkolu
|
||||
new_related_todo_created_short: vytvořen nový úkol
|
||||
new_related_todo_not_created_short: úkol nebyl vytvořen
|
||||
new_related_todo_not_created_short: "úkol nebyl vytvořen"
|
||||
next_action_description: Popis úkolu
|
||||
next_action_needed: Je potřeba zadat aspoň jeden úkol
|
||||
next_actions_description: 'Filtr:'
|
||||
|
|
@ -816,31 +816,31 @@ cs:
|
|||
completed: hotové úkoly
|
||||
due_today: dnes
|
||||
due_within_a_week: během týdne
|
||||
no_actions_due_this_week: Žádné úkoly plánovány na tento týden
|
||||
no_last_completed_actions: Žádné hotové úkoly
|
||||
no_project: --Žádný projekt--
|
||||
no_actions_due_this_week: "Žádné úkoly plánovány na tento týden"
|
||||
no_last_completed_actions: "Žádné hotové úkoly"
|
||||
no_project: "--Žádný projekt--"
|
||||
overdue: Spožděné úkoly
|
||||
pending: Čekající
|
||||
pending: "Čekající"
|
||||
recurrence:
|
||||
daily: Denně
|
||||
daily_every_number_day: Každých %{number} dní
|
||||
daily_options: Nastavení pro denní opakované úkoly
|
||||
day_x_on_every_x_month: '%{day}. den každý %{month}. měsíc'
|
||||
day_x_on_every_x_month: "%{day}. den každý %{month}. měsíc"
|
||||
ends_on: Končí
|
||||
ends_on_date: Končí %{date}
|
||||
ends_on_number_times: Končí po %{number} opakováních
|
||||
every_work_day: Každý pracovní den
|
||||
monthly: Měsíčně
|
||||
monthly_every_xth_day: '%{day} %{day_of_week} každý %{month}. měsíc'
|
||||
monthly_every_xth_day: "%{day} %{day_of_week} každý %{month}. měsíc"
|
||||
monthly_options: Nastavení pro měsíční opakované úkoly
|
||||
no_end_date: Nikdy
|
||||
pattern:
|
||||
day_names:
|
||||
- neděle
|
||||
- pondělí
|
||||
- úterý
|
||||
- "úterý"
|
||||
- středa
|
||||
- čtvrtek
|
||||
- "čtvrtek"
|
||||
- pátek
|
||||
- sobota
|
||||
due: plánováno na
|
||||
|
|
@ -850,30 +850,30 @@ cs:
|
|||
every_xth_day_of_every_n_months: každý %{x} %{day} každých %{n_months}
|
||||
every_year_on: každý rok %{date}
|
||||
first: první
|
||||
fourth: čtvrtý
|
||||
fourth: "čtvrtý"
|
||||
from: od
|
||||
last: poslední
|
||||
month_names:
|
||||
-
|
||||
- Leden
|
||||
- Únor
|
||||
- "Únor"
|
||||
- Březen
|
||||
- Duben
|
||||
- Květen
|
||||
- Červen
|
||||
- Červenec
|
||||
- "Červen"
|
||||
- "Červenec"
|
||||
- Srpen
|
||||
- Září
|
||||
- Říjen
|
||||
- "Říjen"
|
||||
- Listopad
|
||||
- Prosinec
|
||||
on_day_n: '%{n}. den'
|
||||
on_day_n: "%{n}. den"
|
||||
on_work_days: v pracovní dny
|
||||
second: druhý
|
||||
show: ukázat
|
||||
the_xth_day_of_month: '%{x} %{day} měsíce %{month}'
|
||||
the_xth_day_of_month: "%{x} %{day} měsíce %{month}"
|
||||
third: třetí
|
||||
times: (%{number} opakování)
|
||||
times: "(%{number} opakování)"
|
||||
until: do
|
||||
weekly: každý týden
|
||||
starts_on: Začíná
|
||||
|
|
@ -882,13 +882,13 @@ cs:
|
|||
weekly_options: Nastavení pro týdenní opakované úkoly
|
||||
yearly: Ročně
|
||||
yearly_every_x_day: Každý %{month} %{day}
|
||||
yearly_every_xth_day: '%{day} %{day_of_week} měsíce %{month}'
|
||||
yearly_every_xth_day: "%{day} %{day_of_week} měsíce %{month}"
|
||||
yearly_options: Nastavení pro roční opakované úkoly
|
||||
recurrence_completed: Poslední opakování úkolu bylo označeno jako hotové. Opakovaný
|
||||
úkol je dokončený
|
||||
recurrence_period: Interval opakování
|
||||
recurring_action_deleted: Úkol byl smazán. Protože jde o opakovaný úkol, byl vložen
|
||||
nový úkol
|
||||
recurring_action_deleted: "Úkol byl smazán. Protože jde o opakovaný úkol, byl
|
||||
vložen nový úkol"
|
||||
recurring_action_saved: Opakovaný úkol byl uložen
|
||||
recurring_actions_title: TRACKS::Opakované úkoly
|
||||
recurring_deleted_success: Opakovaný úkol byl úspěšně smazán.
|
||||
|
|
@ -898,7 +898,7 @@ cs:
|
|||
removed_predecessor: Byl odstraněn %{successor} jako závislost pro %{predecessor}.
|
||||
scheduled_overdue: Naplánováno zobrazení před %{days} dny
|
||||
see_all_completed: Můžete vidět všechny dokončené akce %{link}
|
||||
set_to_pending: '%{task} nastaven jako čekající'
|
||||
set_to_pending: "%{task} nastaven jako čekající"
|
||||
show_from: Zobrazovat od
|
||||
show_in_days: Zobrazit za %{days} dní
|
||||
show_on_date: Ukázat %{date}
|
||||
|
|
@ -908,12 +908,12 @@ cs:
|
|||
star_action_with_description: ohvězdičkovat úkol '%{description}'
|
||||
tagged_page_title: TRACKS::Se štítkem '%{tag_name}'
|
||||
tagged_with: označeno štítkem ‘%{tag_name}’
|
||||
tags: Štítky (oddělené čárkami)
|
||||
tags: "Štítky (oddělené čárkami)"
|
||||
task_list_title: TRACKS::Úkoly
|
||||
tickler_items_due:
|
||||
one: Jeden úkol v Tickleru je plánován dnes - obnovte stránku pro zobrazení.
|
||||
other: '%{count} položek v Tickleru je plánováno na dnes tickler items are now
|
||||
due - obnovte stránku pro zobrazení.'
|
||||
other: "%{count} položek v Tickleru je plánováno na dnes tickler items are now
|
||||
due - obnovte stránku pro zobrazení."
|
||||
to_tickler: do Tickleru
|
||||
unable_to_add_dependency: Nepodařilo se přidat závislost
|
||||
unresolved_dependency: Hodnota v poli 'závisí na' neodpovídá žádnému existujícímu
|
||||
|
|
@ -962,7 +962,7 @@ cs:
|
|||
signup_new_user: Registrace nového uživatele
|
||||
signup_successful: Registrace uživatele %{username} byla úspěšná.
|
||||
successfully_deleted_user: Uživatel %{username} byl úspěšně smazán
|
||||
total_actions: Úkolů celkem
|
||||
total_actions: "Úkolů celkem"
|
||||
total_contexts: Kontextů celkem
|
||||
total_notes: Poznámek celkem
|
||||
total_projects: Projektů celkem
|
||||
|
|
@ -978,10 +978,10 @@ cs:
|
|||
single_page:
|
||||
one: Zobrazuji 1 %{model}
|
||||
other: Zobrazení všech %{count} %{model}
|
||||
zero: Žádné %{model} nalézt
|
||||
zero: "Žádné %{model} nalézt"
|
||||
single_page_html:
|
||||
one: Zobrazení <b>1</b> %{model}
|
||||
other: Zobrazení <b>vše %{count}</b> %{model}
|
||||
zero: Žádné %{model} nalézt
|
||||
page_gap: '…'
|
||||
previous_label: '« předchozí'
|
||||
zero: "Žádné %{model} nalézt"
|
||||
page_gap: "…"
|
||||
previous_label: "« předchozí"
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ de:
|
|||
last_name: Nachname
|
||||
errors:
|
||||
full_messages:
|
||||
format: '%{attribute} %{message}'
|
||||
format: "%{attribute} %{message}"
|
||||
messages:
|
||||
accepted: muss akzeptiert werden
|
||||
blank: muss ausgefüllt werden
|
||||
|
|
@ -116,7 +116,7 @@ de:
|
|||
not_available_abbr: n/b
|
||||
note:
|
||||
one: 1 Notiz
|
||||
other: '%{count} Notizen'
|
||||
other: "%{count} Notizen"
|
||||
zero: keine Notizen
|
||||
notes: Notizen
|
||||
numbered_step: Schritt %{number}
|
||||
|
|
@ -126,7 +126,7 @@ de:
|
|||
project: Projekt
|
||||
projects: Projekte
|
||||
recurring_todos: Wiederkehrende Aufgaben
|
||||
review: Überprüfung
|
||||
review: "Überprüfung"
|
||||
search: Suchen
|
||||
second: Zweite
|
||||
server_error: Auf dem Server ist ein Fehler aufgetreten.
|
||||
|
|
@ -164,7 +164,7 @@ de:
|
|||
hide_form: Formular verstecken
|
||||
hide_form_title: Formular für neuen Kontext verstecken
|
||||
last_completed_in_context: in diesem Kontext (letzte %{number})
|
||||
new_context_post: ''' wird ebenfalls angelegt. Fortfahren?'
|
||||
new_context_post: "' wird ebenfalls angelegt. Fortfahren?"
|
||||
new_context_pre: Der neue Kontext '
|
||||
no_contexts_active: Derzeit gibt es keine aktiven Kontexte
|
||||
no_contexts_hidden: Derzeit gibt es keine versteckten Kontexte
|
||||
|
|
@ -211,12 +211,12 @@ de:
|
|||
- Freitag
|
||||
- Samstag
|
||||
formats:
|
||||
default: '%d.%m.%Y'
|
||||
long: '%d. %B %Y'
|
||||
longer: '%A, %d. %B %Y'
|
||||
month_day: '%d. %B'
|
||||
only_day: '%d'
|
||||
short: '%d. %b'
|
||||
default: "%d.%m.%Y"
|
||||
long: "%d. %B %Y"
|
||||
longer: "%A, %d. %B %Y"
|
||||
month_day: "%d. %B"
|
||||
only_day: "%d"
|
||||
short: "%d. %b"
|
||||
month_names:
|
||||
-
|
||||
- Januar
|
||||
|
|
@ -263,16 +263,16 @@ de:
|
|||
other: mehr als %{count} Jahre
|
||||
x_days:
|
||||
one: 1 Tag
|
||||
other: '%{count} Tage'
|
||||
other: "%{count} Tage"
|
||||
x_minutes:
|
||||
one: 1 Minute
|
||||
other: '%{count} Minuten'
|
||||
other: "%{count} Minuten"
|
||||
x_months:
|
||||
one: 1 Monat
|
||||
other: '%{count} Monate'
|
||||
other: "%{count} Monate"
|
||||
x_seconds:
|
||||
one: 1 Sekunde
|
||||
other: '%{count} Sekunden'
|
||||
other: "%{count} Sekunden"
|
||||
prompts:
|
||||
day: Tag
|
||||
hour: Stunden
|
||||
|
|
@ -340,7 +340,7 @@ de:
|
|||
export_title: Daten importieren und exportieren
|
||||
feeds: Feeds
|
||||
feeds_title: Liste der verfügbaren Feeds anzeigen
|
||||
help: '?'
|
||||
help: "?"
|
||||
home: Start
|
||||
home_title: Start
|
||||
integrations_: Tracks integrieren
|
||||
|
|
@ -353,7 +353,7 @@ de:
|
|||
projects_title: Projekte
|
||||
recurring_todos: Wiederkehrende Aufgaben
|
||||
recurring_todos_title: Wiederkehrende Aufgaben verwalten
|
||||
review_title: Überprüfung
|
||||
review_title: "Überprüfung"
|
||||
search: Alle Einträge durchsuchen
|
||||
starred: Markiert
|
||||
starred_title: Markierte Aufgaben betrachten
|
||||
|
|
@ -369,8 +369,8 @@ de:
|
|||
toggle_notes_title: Alle Notizen umschalten
|
||||
login:
|
||||
account_login: Account-Anmeldung
|
||||
cas_create_account: 'Wenn Sie die Anfrage fortsetzen möchten, klicken Sie bitte hier:
|
||||
%{signup_link}'
|
||||
cas_create_account: 'Wenn Sie die Anfrage fortsetzen möchten, klicken Sie bitte
|
||||
hier: %{signup_link}'
|
||||
cas_logged_in_greeting: Hallo, %{username}! Sie sind authentifiziert.
|
||||
cas_login: CAS-Anmeldung
|
||||
cas_no_user_found: Hallo, %{username}! Sie haben leider keinen Tracks-Account.
|
||||
|
|
@ -382,7 +382,7 @@ de:
|
|||
login_cas: zum CAS gehen
|
||||
login_standard: zurück zum Standard-Login
|
||||
login_with_openid: Mit einer OpenID anmelden
|
||||
mobile_use_openid: …oder mit einer OpenID anmelden
|
||||
mobile_use_openid: "…oder mit einer OpenID anmelden"
|
||||
openid_identity_url_not_found: Sorry, aber es existiert kein Benutzer mit der
|
||||
Identitäts-URL (%{identity_url})
|
||||
option_separator: oder,
|
||||
|
|
@ -429,19 +429,19 @@ de:
|
|||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: ','
|
||||
format: '%n%u'
|
||||
separator: .
|
||||
unit: €
|
||||
delimiter: ","
|
||||
format: "%n%u"
|
||||
separator: "."
|
||||
unit: "€"
|
||||
format:
|
||||
delimiter: .
|
||||
delimiter: "."
|
||||
precision: 2
|
||||
separator: ','
|
||||
separator: ","
|
||||
human:
|
||||
format:
|
||||
precision: 1
|
||||
storage_units:
|
||||
format: '%n %u'
|
||||
format: "%n %u"
|
||||
units:
|
||||
byte:
|
||||
one: Byte
|
||||
|
|
@ -453,7 +453,7 @@ de:
|
|||
preferences:
|
||||
authentication_header: Deine Authentifizierung
|
||||
change_authentication_type: Authentifzierungsart ändern
|
||||
change_identity_url: Ändere deine Identitäts-URL
|
||||
change_identity_url: "Ändere deine Identitäts-URL"
|
||||
change_password: Passwort ändern
|
||||
current_authentication_type: Dein Authentifizierungsart ist %{auth_type}
|
||||
edit_preferences: Einstellungen bearbeiten
|
||||
|
|
@ -621,8 +621,8 @@ de:
|
|||
avg_created: Durchschnittlich erstellt
|
||||
completed: Erledigt
|
||||
created: Erstellt
|
||||
month_avg_completed: '%{months} Monat durchschnittlich erledigt'
|
||||
month_avg_created: '%{months} Monat durchschnittlich erstellt'
|
||||
month_avg_completed: "%{months} Monat durchschnittlich erledigt"
|
||||
month_avg_created: "%{months} Monat durchschnittlich erstellt"
|
||||
legend:
|
||||
actions: Aufgaben
|
||||
day_of_week: Wochentag
|
||||
|
|
@ -639,7 +639,7 @@ de:
|
|||
open_per_week_legend:
|
||||
actions: Aufgaben
|
||||
weeks: Wochen her
|
||||
other_actions_label: (andere)
|
||||
other_actions_label: "(andere)"
|
||||
projects: Projekte
|
||||
running_time_all: Aktuelle Laufzeit aller unerledigter Aufgaben.
|
||||
running_time_all_legend:
|
||||
|
|
@ -678,15 +678,15 @@ de:
|
|||
unerledigten Aufgaben
|
||||
totals: Ingesamt
|
||||
totals_action_count: hatten Sie insgesamt %{count} Aufgaben
|
||||
totals_actions_completed: '%{count} davon sind erledigt.'
|
||||
totals_actions_completed: "%{count} davon sind erledigt."
|
||||
totals_active_project_count: Von diesen sind %{count} aktive Projekte
|
||||
totals_blocked_actions: '%{count} hängen vom Abschluss anderer Aufgaben ab.'
|
||||
totals_blocked_actions: "%{count} hängen vom Abschluss anderer Aufgaben ab."
|
||||
totals_completed_project_count: und %{count} sind erledigte Projekte.
|
||||
totals_context_count: Sie haben %{count} Kontexte.
|
||||
totals_deferred_actions: von denen %{count} im Notizbuch zurückgestellt sind
|
||||
totals_first_action: Seit deiner ersten Aufgabe am %{date}
|
||||
totals_hidden_context_count: und %{count} sind versteckte Kontexte.
|
||||
totals_hidden_project_count: '%{count} sind versteckt'
|
||||
totals_hidden_project_count: "%{count} sind versteckt"
|
||||
totals_incomplete_actions: Sie haben %{count} unerledigte Aufgaben
|
||||
totals_project_count: Sie haben %{count} Projekte.
|
||||
totals_tag_count: Sie haben %{count} Tags in Aufgaben.
|
||||
|
|
@ -695,25 +695,25 @@ de:
|
|||
within_one: Innerhalb von 1
|
||||
support:
|
||||
array:
|
||||
last_word_connector: ' und '
|
||||
two_words_connector: ' und '
|
||||
words_connector: ', '
|
||||
last_word_connector: und
|
||||
two_words_connector: und
|
||||
words_connector: ","
|
||||
select:
|
||||
prompt: Bitte wählen Sie
|
||||
time:
|
||||
am: vormittags
|
||||
formats:
|
||||
default: '%A, %d. %B %Y, %H:%M Uhr'
|
||||
long: '%A, %d. %B %Y, %H:%M Uhr'
|
||||
month_day: '%d. %B'
|
||||
short: '%d. %B, %H:%M Uhr'
|
||||
stats: '%a %d-%m'
|
||||
time: '%H:%M'
|
||||
default: "%A, %d. %B %Y, %H:%M Uhr"
|
||||
long: "%A, %d. %B %Y, %H:%M Uhr"
|
||||
month_day: "%d. %B"
|
||||
short: "%d. %B, %H:%M Uhr"
|
||||
stats: "%a %d-%m"
|
||||
time: "%H:%M"
|
||||
pm: nachmittags
|
||||
todos:
|
||||
action_deleted_error: Fehler beim Löschen der Aufgabe
|
||||
action_deleted_success: Die nächste Aufgabe erfolgreich gelöscht
|
||||
action_due_on: (Aufgabe fällig am %{date})
|
||||
action_due_on: "(Aufgabe fällig am %{date})"
|
||||
action_marked_complete: Die Aufgabe <strong>'%{description}'</strong> wurde als
|
||||
<strong>%{completed}</strong> markiert.
|
||||
action_marked_complete_error: Die Aufgabe <strong>'%{description}'</strong> wurde
|
||||
|
|
@ -722,7 +722,7 @@ de:
|
|||
action_saved_to_tickler: Aufgabe im Notizbuch gespeichert
|
||||
add_another_dependency: Neue Abhängigkeit
|
||||
add_new_recurring: Neue wiederkehrende Aufgabe
|
||||
added_dependency: '%{dependency} als Abhängigkeit hinzugefügt.'
|
||||
added_dependency: "%{dependency} als Abhängigkeit hinzugefügt."
|
||||
added_new_context: Neuer Kontext hinzugefügt
|
||||
added_new_next_action: Neue Aufgabe angelegt
|
||||
added_new_next_action_plural: Neue weiterführende Aufgaben angelegt
|
||||
|
|
@ -761,14 +761,15 @@ de:
|
|||
completed_tagged_page_title: 'TRACKS:: Erledigte Aufgaben mit Tag %{tag_name}'
|
||||
completed_tasks_title: TRACKS::Erledigte Aufgaben
|
||||
completed_today: Heute erledigt
|
||||
confirm_delete: Sind Sie sicher, dass Sie die Aufgabe '%{description}' löschen möchten?
|
||||
confirm_delete: Sind Sie sicher, dass Sie die Aufgabe '%{description}' löschen
|
||||
möchten?
|
||||
context_changed: Kontext zu %{name} gewechselt
|
||||
convert_to_project: In Projekt umwandeln
|
||||
defer_date_after_due_date: Zurückstellungsdatum nach Ablaufdatum. Bitte passe
|
||||
das Ablaufdatum an, dass es vor dem Zurückstellungsdatum liegt.
|
||||
defer_x_days:
|
||||
one: Einen Tag zurückstellen
|
||||
other: '%{count} Tage zurückstellen'
|
||||
other: "%{count} Tage zurückstellen"
|
||||
deferred_actions_with: Zurückgestellte Aufgaben mit dem Tag '%{tag_name}'
|
||||
deferred_pending_actions: Aufgeschobene und ausstehende Aufgaben
|
||||
deferred_tasks_title: TRACKS::Notizbuch
|
||||
|
|
@ -827,8 +828,8 @@ de:
|
|||
due_in_x_days: Fällig in %{days} Tagen
|
||||
due_today: Heute fällig
|
||||
due_tomorrow: Fällig morgen
|
||||
overdue_by: Überfällig mit %{days} Tag
|
||||
overdue_by_plural: Überfällig mit %{days} Tagen
|
||||
overdue_by: "Überfällig mit %{days} Tag"
|
||||
overdue_by_plural: "Überfällig mit %{days} Tagen"
|
||||
next_actions_title: TRACKS::Weitere Aufgaben
|
||||
next_actions_title_additions:
|
||||
completed: Aufgaben erledigt
|
||||
|
|
@ -836,8 +837,8 @@ de:
|
|||
due_within_a_week: diese Woche fällig
|
||||
no_actions_due_this_week: Keine fälligen Aufgaben diese Woche
|
||||
no_last_completed_actions: Keine erledigten Aufgaben gefunden
|
||||
no_project: --Kein Projekt--
|
||||
overdue: überfällig
|
||||
no_project: "--Kein Projekt--"
|
||||
overdue: "überfällig"
|
||||
pending: Ausstehend
|
||||
recurrence:
|
||||
daily: Täglich
|
||||
|
|
@ -899,7 +900,7 @@ de:
|
|||
weekly_every_number_week: Kehrt jede %{number}. Woche wieder am
|
||||
weekly_options: Einstellungen wöchentliche Aufgaben
|
||||
yearly: Jährlich
|
||||
yearly_every_x_day: 'Jeden %{day}. %{month} '
|
||||
yearly_every_x_day: Jeden %{day}. %{month}
|
||||
yearly_every_xth_day: Den %{day} %{day_of_week} des %{month}
|
||||
yearly_options: Einstellungen jährliche Aufgaben
|
||||
recurrence_completed: Nach dieser erledigten wiederkehrenden Aufgabe folgt keine
|
||||
|
|
@ -913,10 +914,10 @@ de:
|
|||
recurring_pattern_removed: Das Wiederholungsmuster wurde entfernt %{count}
|
||||
recurring_todos: Wiederkehrende Aufgaben
|
||||
remove_dependency: Abhängigkeit löschen (löscht nicht die Aufgabe)
|
||||
removed_predecessor: '%{successor} entfernt als Abhängigkeit von %{predecessor}.'
|
||||
removed_predecessor: "%{successor} entfernt als Abhängigkeit von %{predecessor}."
|
||||
scheduled_overdue: Planmäßig angezeigt vor %{days} Tagen
|
||||
see_all_completed: Alle erledigten Aufgaben %{link}
|
||||
set_to_pending: '%{task} als ausstehend markiert'
|
||||
set_to_pending: "%{task} als ausstehend markiert"
|
||||
show_from: Anzeigen ab dem
|
||||
show_in_days: Anzeigen in %{days} Tagen
|
||||
show_on_date: Anzeigen am %{date}
|
||||
|
|
@ -930,11 +931,13 @@ de:
|
|||
task_list_title: TRACKS::Aufgaben anzeigen
|
||||
tickler_items_due:
|
||||
one: Ein Notizbuch-Eintrag ist nun fällig - lade die Seite neu, um sie zu sehen.
|
||||
other: '%{count} Notizbuch-Einträge sind nun fällig - lade die Seite neu, um
|
||||
sie zu sehen.'
|
||||
to_tickler: ', im Notizbuch hinterlegt'
|
||||
other: "%{count} Notizbuch-Einträge sind nun fällig - lade die Seite neu, um
|
||||
sie zu sehen."
|
||||
to_tickler: ", im Notizbuch hinterlegt"
|
||||
unable_to_add_dependency: Abhängigkeit nicht hinzufügbar
|
||||
unresolved_dependency: Zu dem Wert, den Sie im Feld ''Hängt ab von'' eingegeben haben, konnte keine Aufgabe gefunden werden. Dieser Wert wird nicht mit der neuen Aufgabe gespeichert. Trotzdem fortfahren?
|
||||
unresolved_dependency: Zu dem Wert, den Sie im Feld ''Hängt ab von'' eingegeben
|
||||
haben, konnte keine Aufgabe gefunden werden. Dieser Wert wird nicht mit der
|
||||
neuen Aufgabe gespeichert. Trotzdem fortfahren?
|
||||
was_due_on_date: war am %{date} fällig
|
||||
users:
|
||||
account_signup: Accounteinrichtung
|
||||
|
|
@ -1003,5 +1006,5 @@ de:
|
|||
one: Angezeigte <b>1</b> %{model}
|
||||
other: Anzeige <b>aller %{count}</b> %{model}
|
||||
zero: Kein %{model} gefunden
|
||||
page_gap: '...'
|
||||
previous_label: « Zurück
|
||||
page_gap: "..."
|
||||
previous_label: "« Zurück"
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ es:
|
|||
last_name: Apellido
|
||||
errors:
|
||||
full_messages:
|
||||
format: '%{attribute} %{message}'
|
||||
format: "%{attribute} %{message}"
|
||||
messages:
|
||||
accepted: debe ser aceptada
|
||||
blank: no puede estar en blanco
|
||||
|
|
@ -77,7 +77,7 @@ es:
|
|||
body: 'Hubo problemas con los campos siguientes:'
|
||||
header:
|
||||
one: Un error esta prohibido %{model} se guarden
|
||||
other: '%{count} errores prohíbe este %{model} que se guarden'
|
||||
other: "%{count} errores prohíbe este %{model} que se guarden"
|
||||
common:
|
||||
action: Tarea
|
||||
actions: Tareas
|
||||
|
|
@ -107,7 +107,7 @@ es:
|
|||
forth: Siguiente
|
||||
fourth: Cuarto
|
||||
go_back: Volver atrás
|
||||
last: Último
|
||||
last: "Último"
|
||||
logout: Salir
|
||||
month: mes
|
||||
months: meses
|
||||
|
|
@ -116,7 +116,7 @@ es:
|
|||
not_available_abbr: n/e
|
||||
note:
|
||||
one: 1 nota
|
||||
other: '%{count} notas'
|
||||
other: "%{count} notas"
|
||||
zero: 0 notas
|
||||
notes: Notas
|
||||
numbered_step: Paso %{number}
|
||||
|
|
@ -133,13 +133,13 @@ es:
|
|||
show_all: Mostrar todo
|
||||
sort:
|
||||
alphabetically: Alfabéticamente
|
||||
alphabetically_confirm: ¿Está seguro que desea ordenar los proyectos por orden
|
||||
alfabético? Esto reemplazará el orden existente.
|
||||
alphabetically_confirm: "¿Está seguro que desea ordenar los proyectos por orden
|
||||
alfabético? Esto reemplazará el orden existente."
|
||||
alphabetically_title: Proyectos de ordenar alfabéticamente
|
||||
by_task_count: Por número de tareas
|
||||
by_task_count_title: Ordenar por número de tareas
|
||||
by_task_count_title_confirm: ¿Está seguro que desea ordenar los proyectos por
|
||||
el número de tareas? Esto reemplazará el orden existente.
|
||||
by_task_count_title_confirm: "¿Está seguro que desea ordenar los proyectos por
|
||||
el número de tareas? Esto reemplazará el orden existente."
|
||||
sort: Ordenar
|
||||
third: Tercero
|
||||
todo: Todo
|
||||
|
|
@ -155,19 +155,19 @@ es:
|
|||
completed_tasks_title: 'TRACKS:: Las acciones completadas en ''%{context_name}''
|
||||
el contexto'
|
||||
context_deleted: Contexto eliminado '%{name}'
|
||||
context_hide: ¿Esconder de la página principal?
|
||||
context_hide: "¿Esconder de la página principal?"
|
||||
context_name: Nombre del contexto
|
||||
delete_context: Eliminar contexto
|
||||
delete_context_confirmation: ¿Está seguro que desea eliminar '%{name}' el contexto?
|
||||
delete_context_confirmation: "¿Está seguro que desea eliminar '%{name}' el contexto?
|
||||
Tenga en cuenta que esto también se eliminarán todas las acciones (la repetición)
|
||||
en este contexto!
|
||||
en este contexto!"
|
||||
delete_context_title: Eliminar contexto
|
||||
edit_context: Editar contexto
|
||||
hidden_contexts: Contextos ocultos
|
||||
hide_form: Esconder formulario
|
||||
hide_form_title: Ocultar el formulario nuevo contexto
|
||||
last_completed_in_context: en este contexto (últimos %{number})
|
||||
new_context_post: ''' También se ha creado. ¿Está seguro?'
|
||||
new_context_post: "' También se ha creado. ¿Está seguro?"
|
||||
new_context_pre: Nuevo contexto '
|
||||
no_contexts_active: Actualmente no hay contextos activos
|
||||
no_contexts_hidden: Actualmente no hay contextos ocultos
|
||||
|
|
@ -214,10 +214,10 @@ es:
|
|||
- Viernes
|
||||
- Sábado
|
||||
formats:
|
||||
default: '%Y-%m-%d'
|
||||
long: '%B %d, %Y'
|
||||
longer: '%A, %d %b %Y'
|
||||
short: '%b %d'
|
||||
default: "%Y-%m-%d"
|
||||
long: "%B %d, %Y"
|
||||
longer: "%A, %d %b %Y"
|
||||
short: "%b %d"
|
||||
month_names:
|
||||
-
|
||||
- Enero
|
||||
|
|
@ -260,16 +260,16 @@ es:
|
|||
other: en %{count} años
|
||||
x_days:
|
||||
one: 1 día
|
||||
other: '%{count} días'
|
||||
other: "%{count} días"
|
||||
x_minutes:
|
||||
one: 1 minuto
|
||||
other: '%{count} minutos'
|
||||
other: "%{count} minutos"
|
||||
x_months:
|
||||
one: 1 mes
|
||||
other: '%{count} meses'
|
||||
other: "%{count} meses"
|
||||
x_seconds:
|
||||
one: Un segundo
|
||||
other: '%{count} segundos'
|
||||
other: "%{count} segundos"
|
||||
prompts:
|
||||
day: Día
|
||||
hour: Hora
|
||||
|
|
@ -295,7 +295,7 @@ es:
|
|||
context_needed: Es necesario que haya al menos un contexto antes de poder solicitar
|
||||
un feed
|
||||
ical_feed: iCal alimentación
|
||||
last_fixed_number: Última %{number} acciones
|
||||
last_fixed_number: "Última %{number} acciones"
|
||||
legend: 'Leyenda:'
|
||||
notice_incomplete_only: 'Nota: Todos los alimentos muestran sólo las acciones
|
||||
que no han sido marcadas como realizadas, a menos que se indique lo contrario.'
|
||||
|
|
@ -337,7 +337,7 @@ es:
|
|||
export_title: Importar y exportar datos
|
||||
feeds: Feeds
|
||||
feeds_title: See a list of available feeds
|
||||
help: '?'
|
||||
help: "?"
|
||||
home: Inicio
|
||||
home_title: Inicio
|
||||
integrations_: Integrar Tracks
|
||||
|
|
@ -377,7 +377,7 @@ es:
|
|||
login_cas: go to the CAS
|
||||
login_standard: go back to the standard login
|
||||
login_with_openid: login with an OpenID
|
||||
mobile_use_openid: …or login with an OpenID
|
||||
mobile_use_openid: "…or login with an OpenID"
|
||||
openid_identity_url_not_found: Sorry, no user by that identity URL exists (%{identity_url})
|
||||
option_separator: or,
|
||||
please_login: Please log in to use Tracks
|
||||
|
|
@ -423,16 +423,16 @@ es:
|
|||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: ','
|
||||
format: '%u%n'
|
||||
separator: .
|
||||
unit: €
|
||||
delimiter: ","
|
||||
format: "%u%n"
|
||||
separator: "."
|
||||
unit: "€"
|
||||
format:
|
||||
delimiter: ','
|
||||
separator: .
|
||||
delimiter: ","
|
||||
separator: "."
|
||||
human:
|
||||
storage_units:
|
||||
format: '%n %u'
|
||||
format: "%n %u"
|
||||
units:
|
||||
byte:
|
||||
one: Byte
|
||||
|
|
@ -590,7 +590,7 @@ es:
|
|||
day_of_week: Día de la semana
|
||||
number_of_actions: Número de acciones
|
||||
actions_dow_30days_title: Day of week (past 30 days)
|
||||
actions_further: ' and further'
|
||||
actions_further: and further
|
||||
actions_last_year: Actions in the last years
|
||||
actions_last_year_legend:
|
||||
months_ago: Months ago
|
||||
|
|
@ -598,7 +598,7 @@ es:
|
|||
actions_lastyear_title: Actions in the last 12 months
|
||||
actions_min_completion_time: The minimum time to complete is %{time}.
|
||||
actions_min_max_completion_days: The Min-/maximum days to complete is %{min}/%{max}.
|
||||
actions_selected_from_week: 'Actions selected from week '
|
||||
actions_selected_from_week: Actions selected from week
|
||||
click_to_return: Click %{link} to return to the statistics page.
|
||||
click_to_return_link: here
|
||||
click_to_show_actions_from_week: Click %{link} to show the actions from week %{week}
|
||||
|
|
@ -613,8 +613,8 @@ es:
|
|||
avg_created: Avg created
|
||||
completed: Completed
|
||||
created: Created
|
||||
month_avg_completed: '%{months} Month avg completed'
|
||||
month_avg_created: '%{months} Month avg created'
|
||||
month_avg_completed: "%{months} Month avg completed"
|
||||
month_avg_created: "%{months} Month avg created"
|
||||
legend:
|
||||
actions: Tareas
|
||||
day_of_week: Day of week
|
||||
|
|
@ -631,7 +631,7 @@ es:
|
|||
open_per_week_legend:
|
||||
actions: Acciones
|
||||
weeks: Semanas atrás
|
||||
other_actions_label: (otros)
|
||||
other_actions_label: "(otros)"
|
||||
projects: Projects
|
||||
running_time_all: Current running time of all incomplete actions
|
||||
running_time_all_legend:
|
||||
|
|
@ -668,15 +668,15 @@ es:
|
|||
actions
|
||||
totals: Totals
|
||||
totals_action_count: you have a total of %{count} actions
|
||||
totals_actions_completed: '%{count} of these are completed.'
|
||||
totals_actions_completed: "%{count} of these are completed."
|
||||
totals_active_project_count: Of those %{count} are active projects
|
||||
totals_blocked_actions: '%{count} are dependent on the completion of their actions.'
|
||||
totals_blocked_actions: "%{count} are dependent on the completion of their actions."
|
||||
totals_completed_project_count: and %{count} are completed projects.
|
||||
totals_context_count: You have %{count} contexts.
|
||||
totals_deferred_actions: of which %{count} are deferred actions in the tickler
|
||||
totals_first_action: Since your first action on %{date}
|
||||
totals_hidden_context_count: and %{count} are hidden contexts.
|
||||
totals_hidden_project_count: '%{count} are hidden'
|
||||
totals_hidden_project_count: "%{count} are hidden"
|
||||
totals_incomplete_actions: You have %{count} incomplete actions
|
||||
totals_project_count: You have %{count} projects.
|
||||
totals_tag_count: You have %{count} tags placed on actions.
|
||||
|
|
@ -685,19 +685,19 @@ es:
|
|||
within_one: Dentro de un
|
||||
support:
|
||||
array:
|
||||
last_word_connector: ', y'
|
||||
last_word_connector: ", y"
|
||||
two_words_connector: y
|
||||
words_connector: ','
|
||||
words_connector: ","
|
||||
select:
|
||||
prompt: Por favor seleccione
|
||||
time:
|
||||
am: soy
|
||||
formats:
|
||||
default: '%a, %d %b %Y %H:%M:%S %z'
|
||||
long: '%B %d, %Y %H:%M'
|
||||
month_day: '%B %d'
|
||||
short: '%d %b %H:%M'
|
||||
stats: '%a %d-%m'
|
||||
default: "%a, %d %b %Y %H:%M:%S %z"
|
||||
long: "%B %d, %Y %H:%M"
|
||||
month_day: "%B %d"
|
||||
short: "%d %b %H:%M"
|
||||
stats: "%a %d-%m"
|
||||
pm: pm
|
||||
todos:
|
||||
no_actions:
|
||||
|
|
@ -705,7 +705,7 @@ es:
|
|||
action_deferred: La acción \'%{description}\' se aplazó
|
||||
action_deleted_error: Failed to delete the action
|
||||
action_deleted_success: Successfully deleted next action
|
||||
action_due_on: (action due on %{date})
|
||||
action_due_on: "(action due on %{date})"
|
||||
action_marked_complete: The action <strong>'%{description}'</strong> was marked
|
||||
as <strong>%{completed}</strong>
|
||||
action_marked_complete_error: The action <strong>'%{description}'</strong> was
|
||||
|
|
@ -827,7 +827,7 @@ es:
|
|||
due_within_a_week: due within a week
|
||||
no_actions_due_this_week: No actions due in rest of this week
|
||||
no_last_completed_actions: No encontró las acciones realizadas
|
||||
no_project: --No project--
|
||||
no_project: "--No project--"
|
||||
overdue: Overdue
|
||||
pending: Pending
|
||||
recurrence:
|
||||
|
|
@ -907,7 +907,7 @@ es:
|
|||
removed_predecessor: Removed %{successor} as dependency from %{predecessor}.
|
||||
scheduled_overdue: Scheduled to show %{days} days ago
|
||||
see_all_completed: Usted puede ver todas las acciones realizadas %{link}
|
||||
set_to_pending: '%{task} set to pending'
|
||||
set_to_pending: "%{task} set to pending"
|
||||
show_from: Show from
|
||||
show_in_days: Show in %{days} days
|
||||
show_on_date: Show on %{date}
|
||||
|
|
@ -921,7 +921,7 @@ es:
|
|||
task_list_title: TRACKS::List tasks
|
||||
tickler_items_due:
|
||||
one: One tickler item is now due - refresh the page to see it.
|
||||
other: '%{count} tickler items are now due - refresh the page to see them.'
|
||||
other: "%{count} tickler items are now due - refresh the page to see them."
|
||||
to_tickler: to tickler
|
||||
unable_to_add_dependency: Unable to add dependency
|
||||
unresolved_dependency: The value you entered in the dependency field did not resolve
|
||||
|
|
@ -992,5 +992,5 @@ es:
|
|||
one: Viendo del <b>1</b> %{model}
|
||||
other: Viendo <b>todos los %{count}</b> %{model}
|
||||
zero: No %{model} encontrado
|
||||
page_gap: '...'
|
||||
previous_label: « Anterior
|
||||
page_gap: "..."
|
||||
previous_label: "« Anterior"
|
||||
|
|
|
|||
|
|
@ -31,24 +31,24 @@ fr:
|
|||
week_starts: Les semaines commencent un
|
||||
project:
|
||||
default_context_name: Contexte par défaut
|
||||
default_tags: Étiquette par défaut
|
||||
default_tags: "Étiquette par défaut"
|
||||
description: Description
|
||||
name: Nom
|
||||
todo:
|
||||
context: Contexte
|
||||
description: Description
|
||||
due: Échéance
|
||||
due: "Échéance"
|
||||
notes: Note
|
||||
predecessors: Dépend de
|
||||
project: Projet
|
||||
show_from: Afficher depuis
|
||||
tags: Étiquettes
|
||||
tags: "Étiquettes"
|
||||
user:
|
||||
first_name: Prénom
|
||||
last_name: Nom
|
||||
errors:
|
||||
full_messages:
|
||||
format: '%{attribute} %{message}'
|
||||
format: "%{attribute} %{message}"
|
||||
messages:
|
||||
accepted: doit être accepté
|
||||
blank: ne peux être vide
|
||||
|
|
@ -81,7 +81,7 @@ fr:
|
|||
body: 'Il y a des problèmes avec les champs suivants :'
|
||||
header:
|
||||
one: 1 erreur a empêché ce %{model} d'être sauvegardé
|
||||
other: '%{count} erreurs ont empêché ce %{model} d''être sauvegardé'
|
||||
other: "%{count} erreurs ont empêché ce %{model} d'être sauvegardé"
|
||||
common:
|
||||
action: Action
|
||||
actions: Actions
|
||||
|
|
@ -122,10 +122,10 @@ fr:
|
|||
not_available_abbr: n/a
|
||||
note:
|
||||
one: 1 note
|
||||
other: '%{count} notes'
|
||||
other: "%{count} notes"
|
||||
zero: non notes
|
||||
notes: Notes
|
||||
numbered_step: Étape %{number}
|
||||
numbered_step: "Étape %{number}"
|
||||
ok: OK
|
||||
optional: optionnel
|
||||
previous: Précédente
|
||||
|
|
@ -139,13 +139,13 @@ fr:
|
|||
show_all: voir tous
|
||||
sort:
|
||||
alphabetically: Par ordre alphabétique
|
||||
alphabetically_confirm: Êtes-vous sûr de vouloir trier ces projets par ordre
|
||||
alphabétique ? L'ordre actuel sera remplacé.
|
||||
alphabetically_confirm: "Êtes-vous sûr de vouloir trier ces projets par ordre
|
||||
alphabétique ? L'ordre actuel sera remplacé."
|
||||
alphabetically_title: Trier les projets par ordre alphabétique
|
||||
by_task_count: Par nombre de tâches
|
||||
by_task_count_title: Trier par nombre de tâches
|
||||
by_task_count_title_confirm: Êtes-vous sûr de vouloir trier ces projets par
|
||||
nombre de tâches ? L'ordre actuel sera remplacé.
|
||||
by_task_count_title_confirm: "Êtes-vous sûr de vouloir trier ces projets par
|
||||
nombre de tâches ? L'ordre actuel sera remplacé."
|
||||
sort: Trier
|
||||
third: Troisième
|
||||
todo: Action
|
||||
|
|
@ -162,15 +162,15 @@ fr:
|
|||
context_hide: Caché de la première page ?
|
||||
context_name: Nom du Contexte
|
||||
delete_context: Supprimer contexte
|
||||
delete_context_confirmation: Êtes-vous sûr de vouloir supprimer le contexte %{name}?
|
||||
Toutes les actions (répétitives) de ce contexte seront également supprimées !
|
||||
delete_context_confirmation: "Êtes-vous sûr de vouloir supprimer le contexte %{name}?
|
||||
Toutes les actions (répétitives) de ce contexte seront également supprimées !"
|
||||
delete_context_title: Supprimer contexte
|
||||
edit_context: Modifier contexte
|
||||
hidden_contexts: Contextes cachés
|
||||
hide_form: Cacher le formulaire
|
||||
hide_form_title: Cacher le formulaire nouveau contexte
|
||||
last_completed_in_context: dans ce contexte (dernier %{number})
|
||||
new_context_post: ?» sera aussi créé. Êtes-vous sûr ?
|
||||
new_context_post: "?» sera aussi créé. Êtes-vous sûr ?"
|
||||
new_context_pre: Le contexte «?
|
||||
no_contexts_active: Actuellement, il n'y a pas de contextes actifs
|
||||
no_contexts_hidden: Actuellement, il n'y a pas de contextes cachés
|
||||
|
|
@ -217,12 +217,12 @@ fr:
|
|||
- vendredi
|
||||
- samedi
|
||||
formats:
|
||||
default: '%d/%m/%Y'
|
||||
long: '%e %B %Y'
|
||||
longer: '%A, %d %b %Y'
|
||||
month_day: '%d. %B'
|
||||
only_day: '%e'
|
||||
short: '%e %b'
|
||||
default: "%d/%m/%Y"
|
||||
long: "%e %B %Y"
|
||||
longer: "%A, %d %b %Y"
|
||||
month_day: "%d. %B"
|
||||
only_day: "%e"
|
||||
short: "%e %b"
|
||||
month_names:
|
||||
-
|
||||
- janvier
|
||||
|
|
@ -269,16 +269,16 @@ fr:
|
|||
other: plus de %{count} ans
|
||||
x_days:
|
||||
one: 1 jour
|
||||
other: '%{count} jours'
|
||||
other: "%{count} jours"
|
||||
x_minutes:
|
||||
one: 1 minute
|
||||
other: '%{count} minutes'
|
||||
other: "%{count} minutes"
|
||||
x_months:
|
||||
one: 1 mois
|
||||
other: '%{count} mois'
|
||||
other: "%{count} mois"
|
||||
x_seconds:
|
||||
one: 1 seconde
|
||||
other: '%{count} secondes'
|
||||
other: "%{count} secondes"
|
||||
prompts:
|
||||
day: Jour
|
||||
hour: Heure
|
||||
|
|
@ -333,10 +333,6 @@ fr:
|
|||
footer:
|
||||
send_feedback: Envoyer un feedback sur %{version}
|
||||
helpers:
|
||||
button:
|
||||
create: Créer %{model}
|
||||
submit: Sauvegarder %{model}
|
||||
update: Mettre à jour %{model}
|
||||
select:
|
||||
prompt: Sélectionnez
|
||||
submit:
|
||||
|
|
@ -359,7 +355,7 @@ fr:
|
|||
new_action: 0-Nouvelle action
|
||||
projects: Projets
|
||||
starred: Favoris
|
||||
tickler: Échéancier
|
||||
tickler: "Échéancier"
|
||||
navigation:
|
||||
admin: Administration
|
||||
api_docs: API REST
|
||||
|
|
@ -372,7 +368,7 @@ fr:
|
|||
export_title: Importer et exporter des données
|
||||
feeds: Flux
|
||||
feeds_title: Voir une liste des flux disponibles
|
||||
help: '?'
|
||||
help: "?"
|
||||
home: Accueil
|
||||
home_title: Accueil
|
||||
integrations_: Intégrer Tracks
|
||||
|
|
@ -392,8 +388,8 @@ fr:
|
|||
starred_title: Voir vos actions préférées
|
||||
stats: Statistiques
|
||||
stats_title: Voir vos statistiques
|
||||
tickler: Échéancier
|
||||
tickler_title: Échéancier
|
||||
tickler: "Échéancier"
|
||||
tickler_title: "Échéancier"
|
||||
view: Vue
|
||||
next_actions_rss_feed: Flux RSS des prochaines actions
|
||||
toggle_contexts: Basculer contextes effondré
|
||||
|
|
@ -413,7 +409,7 @@ fr:
|
|||
login_cas: Aller au CAS
|
||||
login_standard: retourner à l'écran de connexion standard
|
||||
login_with_openid: se connecter avec un OpenID
|
||||
mobile_use_openid: '... ou ce connecter avec un OpenID'
|
||||
mobile_use_openid: "... ou ce connecter avec un OpenID"
|
||||
openid_identity_url_not_found: Désolé, aucun utilisateur avec cette identité URL
|
||||
n'existe (%{identity_url})
|
||||
option_separator: ou,
|
||||
|
|
@ -428,11 +424,11 @@ fr:
|
|||
user_no_expiry: Rester connecté
|
||||
models:
|
||||
preference:
|
||||
due_in: Échéance dans %{days} jours
|
||||
due_on: Échéance le %{date}
|
||||
due_in: "Échéance dans %{days} jours"
|
||||
due_on: "Échéance le %{date}"
|
||||
due_styles:
|
||||
- Échéance dans ____ jours
|
||||
- Échéance le ____
|
||||
- "Échéance dans ____ jours"
|
||||
- "Échéance le ____"
|
||||
project:
|
||||
feed_description: Liste de tous les projets de %{username}
|
||||
feed_title: Projets Tracks
|
||||
|
|
@ -442,9 +438,9 @@ fr:
|
|||
error_context_not_associated: L'identifiant contexte %{context} n'est pas associé
|
||||
à l'identifiant utilisateur %{user}.
|
||||
notes:
|
||||
delete_confirmation: Êtes-vous sur de vouloir supprimer la note «?%{id}?» ?
|
||||
delete_confirmation: "Êtes-vous sur de vouloir supprimer la note «?%{id}?» ?"
|
||||
delete_item_title: Supprimer l'élément
|
||||
delete_note_confirm: Êtes-vous sur de vouloir supprimer la note «?%{id}?» ?
|
||||
delete_note_confirm: "Êtes-vous sur de vouloir supprimer la note «?%{id}?» ?"
|
||||
delete_note_title: Supprimer la note «?%{id}?»
|
||||
deleted_note: Supprimer la note «?%{id}?»
|
||||
edit_item_title: Modifier l'élément
|
||||
|
|
@ -458,17 +454,17 @@ fr:
|
|||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: ','
|
||||
format: '%u%n'
|
||||
delimiter: ","
|
||||
format: "%u%n"
|
||||
precision: 2
|
||||
separator: .
|
||||
separator: "."
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
unit: $
|
||||
unit: "$"
|
||||
format:
|
||||
delimiter: ','
|
||||
delimiter: ","
|
||||
precision: 2
|
||||
separator: .
|
||||
separator: "."
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
human:
|
||||
|
|
@ -477,7 +473,7 @@ fr:
|
|||
significant: true
|
||||
strip_insignificant_zeros: true
|
||||
storage_units:
|
||||
format: '%n %u'
|
||||
format: "%n %u"
|
||||
units:
|
||||
byte:
|
||||
one: Octet
|
||||
|
|
@ -492,10 +488,10 @@ fr:
|
|||
change_identity_url: Modifier votre URL d'identité
|
||||
change_password: Modifier votre mot de passe
|
||||
current_authentication_type: Votre type d'authentification est %{auth_type}
|
||||
edit_preferences: Éditer les préférences
|
||||
edit_preferences: "Éditer les préférences"
|
||||
generate_new_token: Générer un nouveau jeton
|
||||
generate_new_token_confirm: Êtes-vous sûr ? Générer un nouveau jeton va remplacer
|
||||
le jeton existant et en interdire les utilisations externes.
|
||||
generate_new_token_confirm: "Êtes-vous sûr ? Générer un nouveau jeton va remplacer
|
||||
le jeton existant et en interdire les utilisations externes."
|
||||
is_false: faux
|
||||
is_true: vrai
|
||||
open_id_url: Votre URL OpenID est
|
||||
|
|
@ -505,7 +501,7 @@ fr:
|
|||
à nouveau.
|
||||
show_number_completed: Montrer %{number} items réalisés
|
||||
sms_context_none: Aucun
|
||||
staleness_starts_after: '"date de fraicher" dépassée à près %{days} days'
|
||||
staleness_starts_after: "\"date de fraicher\" dépassée à près %{days} days"
|
||||
tabs:
|
||||
authentication: Authentification
|
||||
date_and_time: Date et heure
|
||||
|
|
@ -529,10 +525,10 @@ fr:
|
|||
default_context_set: Définir le contexte par défaut du projet à %{default_context}
|
||||
default_tags_removed_notice: Supprimer les étiquettes par défaut
|
||||
delete_project: Supprimer projet
|
||||
delete_project_confirmation: Êtes-vous sûr de vouloir supprimer le projet «?%{name}?» ?
|
||||
delete_project_confirmation: "Êtes-vous sûr de vouloir supprimer le projet «?%{name}?» ?"
|
||||
delete_project_title: Supprimer le projet
|
||||
edit_project_settings: Modifier les paramètres du projet
|
||||
edit_project_title: Éditer le projet
|
||||
edit_project_title: "Éditer le projet"
|
||||
hidden_projects: Projets cachés
|
||||
hide_form: Cacher le formulaire
|
||||
hide_form_title: Cacher le formulaire nouveau projet
|
||||
|
|
@ -568,8 +564,8 @@ fr:
|
|||
no_results: Aucun résultat à votre recherche.
|
||||
notes_matching_query: Notes correspondant à la requête
|
||||
projects_matching_query: Projets correspondant à la requête
|
||||
tags_matching_query: Étiquettes correspondant à la requête
|
||||
todos_matching_query: À faire correspondant à la requête
|
||||
tags_matching_query: "Étiquettes correspondant à la requête"
|
||||
todos_matching_query: "À faire correspondant à la requête"
|
||||
shared:
|
||||
add_action: Ajouter action
|
||||
add_actions: Ajouter actions
|
||||
|
|
@ -581,7 +577,7 @@ fr:
|
|||
multiple_next_actions: Actions suivante multiples (une sur chaque ligne)
|
||||
project_for_all_actions: Projet pour toutes les actions
|
||||
separate_tags_with_commas: séparer avec des virgules
|
||||
tags_for_all_actions: Étiquettes pour toutes les actions (sép. avec des virgules)
|
||||
tags_for_all_actions: "Étiquettes pour toutes les actions (sép. avec des virgules)"
|
||||
toggle_multi: Ajouter plusieurs actions suivantes
|
||||
toggle_multi_title: Basculer formulaire action simple/multiple
|
||||
toggle_single: Ajouter action suivante
|
||||
|
|
@ -676,7 +672,7 @@ fr:
|
|||
open_per_week_legend:
|
||||
actions: Actions
|
||||
weeks: Semaines Il ya
|
||||
other_actions_label: (autres)
|
||||
other_actions_label: "(autres)"
|
||||
projects: Projets
|
||||
running_time_all: Temps en cours de toutes les actions incomplètes
|
||||
running_time_all_legend:
|
||||
|
|
@ -694,11 +690,11 @@ fr:
|
|||
tous les contextes
|
||||
tag_cloud_90days_description: Nuage d'étiquettes correspondant aux actions créées
|
||||
ou réalisées lors des 90 derniers jours.
|
||||
tag_cloud_90days_title: Étiquettes pour les actions des 90 derniers jours
|
||||
tag_cloud_90days_title: "Étiquettes pour les actions des 90 derniers jours"
|
||||
tag_cloud_description: Nuage d'étiquettes correspondant à la totalité des actions
|
||||
(réalisées, en cours, visibles ou cachées).
|
||||
tag_cloud_title: Étiquettes pour toutes les actions
|
||||
tags: Étiquettes
|
||||
tag_cloud_title: "Étiquettes pour toutes les actions"
|
||||
tags: "Étiquettes"
|
||||
time_of_day: Heure (toutes les actions)
|
||||
time_of_day_legend:
|
||||
number_of_actions: Nombre d'actions
|
||||
|
|
@ -717,51 +713,50 @@ fr:
|
|||
totals_action_count: vous avez un total de %{count} actions
|
||||
totals_actions_completed: dont %{count} sont réalisées.
|
||||
totals_active_project_count: De ceux-ci %{count} sont des projets actifs
|
||||
totals_blocked_actions: '%{count} dépendent de la réalisation de leurs actions'
|
||||
totals_blocked_actions: "%{count} dépendent de la réalisation de leurs actions"
|
||||
totals_completed_project_count: et %{count} sont des projets réalisés.
|
||||
totals_context_count: Vous avez %{count} contextes.
|
||||
totals_deferred_actions: desquels %{count} sont des actions reportées dans l'échéancier
|
||||
totals_first_action: Depuis votre première action du %{date}
|
||||
totals_hidden_context_count: et %{count} sont des contextes cachés.
|
||||
totals_hidden_project_count: '%{count} sont cachés'
|
||||
totals_hidden_project_count: "%{count} sont cachés"
|
||||
totals_incomplete_actions: Vous avez %{count} actions en cours
|
||||
totals_project_count: Vous avez %{count} projets
|
||||
totals_tag_count: Vous avez %{count} étiquettes sur des actions.
|
||||
totals_unique_tags: '%{count} étiquettes sont uniques.'
|
||||
totals_visible_context_count: '%{count} sont des contextes visibles'
|
||||
totals_unique_tags: "%{count} étiquettes sont uniques."
|
||||
totals_visible_context_count: "%{count} sont des contextes visibles"
|
||||
within_one: Moins de 1
|
||||
support:
|
||||
array:
|
||||
last_word_connector: ', et'
|
||||
last_word_connector: ", et"
|
||||
two_words_connector: et
|
||||
words_connector: ','
|
||||
words_connector: ","
|
||||
select:
|
||||
prompt: Veuillez sélectionner
|
||||
time:
|
||||
am: am
|
||||
formats:
|
||||
default: '%a, %d %b %Y %H:%M:%S %z'
|
||||
long: '%B %d, %Y %H:%M'
|
||||
month_day: '%B %d'
|
||||
short: '%d %b %H:%M'
|
||||
stats: '%a %d-%m'
|
||||
time: '%H:%M'
|
||||
default: "%a, %d %b %Y %H:%M:%S %z"
|
||||
long: "%B %d, %Y %H:%M"
|
||||
month_day: "%B %d"
|
||||
short: "%d %b %H:%M"
|
||||
stats: "%a %d-%m"
|
||||
time: "%H:%M"
|
||||
pm: pm
|
||||
todos:
|
||||
action_deferred: L'action «?%{description}?» a été reportée
|
||||
action_deleted_error: La suppression de l'action a échoué
|
||||
action_deleted_success: L'action suivante à été supprimée avec succès
|
||||
action_due_on: (action à terminer avant le %{date})
|
||||
action_due_on: "(action à terminer avant le %{date})"
|
||||
action_marked_complete: L'action <strong>'%{description}'</strong> a été marquée
|
||||
comme <strong>%{completed}</strong>
|
||||
action_marked_complete_error: 'L''action <strong>''%{description}''</strong> n''a
|
||||
PAS été marquée comme <strong>%{completed} a cause d''une erreur sur le serveur
|
||||
</strong> '
|
||||
action_marked_complete_error: L'action <strong>'%{description}'</strong> n'a PAS
|
||||
été marquée comme <strong>%{completed} a cause d'une erreur sur le serveur </strong>
|
||||
action_saved: Action sauvegardée
|
||||
action_saved_to_tickler: Action sauvegardée dans l'échéancier
|
||||
add_another_dependency: Ajouter une autre dépendance
|
||||
add_new_recurring: Ajouter une nouvelle action récurrente
|
||||
added_dependency: '%{dependency} ajoutée comme dépendance'
|
||||
added_dependency: "%{dependency} ajoutée comme dépendance"
|
||||
added_new_context: Nouveau context ajouté
|
||||
added_new_next_action: Nouvelle action suivante ajoutée
|
||||
added_new_next_action_plural: Nouvelles actions suivantes ajoutées
|
||||
|
|
@ -775,10 +770,10 @@ fr:
|
|||
archived_tasks_title: TRACKS::Tâches réalisées archivées
|
||||
blocked_by: Bloqué par %{predecessors}
|
||||
calendar:
|
||||
due_next_week: À réaliser la semaine prochaine
|
||||
due_this_month: À réaliser avant la fin de %{month}
|
||||
due_this_week: À réaliser avant la fin de cette semaine
|
||||
due_today: À réaliser aujourd'hui
|
||||
due_next_week: "À réaliser la semaine prochaine"
|
||||
due_this_month: "À réaliser avant la fin de %{month}"
|
||||
due_this_week: "À réaliser avant la fin de cette semaine"
|
||||
due_today: "À réaliser aujourd'hui"
|
||||
get_in_ical_format: Télécharger au format iCal
|
||||
calendar_page_title: TRACKS::Calendrier
|
||||
cannot_add_dependency_to_completed_todo: Impossible d'ajouter cette action en
|
||||
|
|
@ -800,7 +795,7 @@ fr:
|
|||
completed_rest_of_week: Complété dans le reste de cette semaine
|
||||
completed_tagged_page_title: TRACKS::Les tâches terminées avec marquer %{tag_name}
|
||||
completed_tasks_title: TRACKS::Tâches complétées
|
||||
confirm_delete: Êtes-vous sûr de vouloir supprimer l'action '%{description}' ?
|
||||
confirm_delete: "Êtes-vous sûr de vouloir supprimer l'action '%{description}' ?"
|
||||
context_changed: Contexte changé en %{name}
|
||||
convert_to_project: Faire projet
|
||||
defer_date_after_due_date: La date de report est après la date d'échéance. Veuillez
|
||||
|
|
@ -820,7 +815,7 @@ fr:
|
|||
done: Terminé ?
|
||||
drag_action_title: Déplacer sur une autre action pour la rendre dépendante de
|
||||
cette action
|
||||
due: Échéance
|
||||
due: "Échéance"
|
||||
edit: Modifier
|
||||
edit_action: Modifier action
|
||||
edit_action_with_description: Modifier l'action '%{description}'
|
||||
|
|
@ -843,7 +838,7 @@ fr:
|
|||
feed_title_in_project: dans le projet '%{project}'
|
||||
feeds:
|
||||
completed: 'Complété : %{date}'
|
||||
due: 'Échéance : %{date}'
|
||||
due: "Échéance : %{date}"
|
||||
has_x_pending:
|
||||
one: A une action en attente
|
||||
other: A %{count} actions en attente
|
||||
|
|
@ -856,7 +851,7 @@ fr:
|
|||
mobile_todos_page_title: Toutes les actions
|
||||
new_related_todo_created: Une nouvelle tâche a été ajoutée qui appartient à cette
|
||||
tâche récurrente
|
||||
new_related_todo_created_short: à créé une nouvelle tâche
|
||||
new_related_todo_created_short: "à créé une nouvelle tâche"
|
||||
new_related_todo_not_created_short: n'a pas créé la tâche
|
||||
next_action_description: Description de la prochaine action
|
||||
next_action_needed: Vous devez soumettre au moins une prochaine action
|
||||
|
|
@ -865,19 +860,19 @@ fr:
|
|||
completed: dans les %{count} derniers jours
|
||||
due_date: avec au plus la date d'échéance %{due_date}
|
||||
next_actions_due_date:
|
||||
due_in_x_days: Échéance dans %{days} days
|
||||
due_today: Échéance aujourd'hui
|
||||
due_tomorrow: Échéance demain
|
||||
due_in_x_days: "Échéance dans %{days} days"
|
||||
due_today: "Échéance aujourd'hui"
|
||||
due_tomorrow: "Échéance demain"
|
||||
overdue_by: Dépassée de %{days} jour
|
||||
overdue_by_plural: Dépassée de %{days} jours
|
||||
next_actions_title: Tracks - Prochaines Actions
|
||||
next_actions_title_additions:
|
||||
completed: Actions complétées
|
||||
due_today: échéance aujourd'hui
|
||||
due_within_a_week: échéance dans la semaine
|
||||
due_today: "échéance aujourd'hui"
|
||||
due_within_a_week: "échéance dans la semaine"
|
||||
no_actions_due_this_week: Pas actions à faire cette semaine
|
||||
no_last_completed_actions: Aucune action achevée trouvée
|
||||
no_project: --Pas de projet--
|
||||
no_project: "--Pas de projet--"
|
||||
overdue: En retard
|
||||
pending: En attente
|
||||
recurrence:
|
||||
|
|
@ -902,7 +897,7 @@ fr:
|
|||
- Jeudi
|
||||
- Vendredi
|
||||
- Samedi
|
||||
due: Échéance
|
||||
due: "Échéance"
|
||||
every_day: chaque jour
|
||||
every_month: chaque mois
|
||||
every_n: tous les %{n}
|
||||
|
|
@ -957,23 +952,23 @@ fr:
|
|||
removed_predecessor: Suppression de %{successor} comme dépendance de %{predecessor}
|
||||
scheduled_overdue: Programmée pour apparaitre il y a %{days} jours
|
||||
see_all_completed: Vous pouvez voir toutes les actions accomplies %{link}
|
||||
set_to_pending: '%{task} mise en attente'
|
||||
set_to_pending: "%{task} mise en attente"
|
||||
show_from: Afficher depuis
|
||||
show_in_days: Afficher dans %{days} jours
|
||||
show_on_date: Afficher le %{date}
|
||||
show_today: Afficher aujourd'hui
|
||||
show_tomorrow: Afficher demain
|
||||
star_action: Élire cette action
|
||||
star_action_with_description: Élire l'action '%{description}'
|
||||
star_action: "Élire cette action"
|
||||
star_action_with_description: "Élire l'action '%{description}'"
|
||||
tagged_page_title: TRACKS::Étiquetté avec %{tag_name}'
|
||||
tagged_with: étiquettées avec «?%{tag_name}?»
|
||||
tags: Étiquettes (séparées par des virgules)
|
||||
tagged_with: "étiquettées avec «?%{tag_name}?»"
|
||||
tags: "Étiquettes (séparées par des virgules)"
|
||||
task_list_title: TRACKS::Lister les tâches
|
||||
tickler_items_due:
|
||||
one: Un élément de l'échéancier est arrivé à échéance ? rafraîchir la page pour
|
||||
le voir.
|
||||
other: '%{count} éléments de l''échéancier sont arrivés à échéance ? rafraîchir
|
||||
la page pour les voir.'
|
||||
other: "%{count} éléments de l'échéancier sont arrivés à échéance ? rafraîchir
|
||||
la page pour les voir."
|
||||
to_tickler: vers l'échéancier
|
||||
unable_to_add_dependency: Impossible d'ajouter la dépendance
|
||||
unresolved_dependency: La valeur saisie dans le champ dépendance ne correspond
|
||||
|
|
@ -1048,5 +1043,5 @@ fr:
|
|||
one: Voir de <b>1</b> %{model}
|
||||
other: Afficher <b>tous les %{count}</b> %{model}
|
||||
zero: Aucun %{model} trouvés
|
||||
page_gap: '...'
|
||||
previous_label: «Précédent
|
||||
page_gap: "..."
|
||||
previous_label: "«Précédent"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -45,7 +45,7 @@ nl:
|
|||
last_name: Achternaam
|
||||
errors:
|
||||
full_messages:
|
||||
format: '%{attribute} %{message}'
|
||||
format: "%{attribute} %{message}"
|
||||
messages:
|
||||
accepted: moet geaccepteerd worden
|
||||
blank: mag niet leeg zijn
|
||||
|
|
@ -78,7 +78,7 @@ nl:
|
|||
body: Er waren problemen met de volgende velden
|
||||
header:
|
||||
one: 1 fout voorkomt het kunnen bewaren van deze %{model}
|
||||
other: '%{count} fouten voorkomen dat dit %{model} bewaard kan worden'
|
||||
other: "%{count} fouten voorkomen dat dit %{model} bewaard kan worden"
|
||||
common:
|
||||
action: Actie
|
||||
actions: Acties
|
||||
|
|
@ -117,7 +117,7 @@ nl:
|
|||
not_available_abbr: n/b
|
||||
note:
|
||||
one: 1 notitie
|
||||
other: '%{count} notities'
|
||||
other: "%{count} notities"
|
||||
zero: geen notities
|
||||
notes: Notities
|
||||
numbered_step: Stap %{number}
|
||||
|
|
@ -165,9 +165,9 @@ nl:
|
|||
edit_context: Bewerk context
|
||||
hidden_contexts: Verborgen contexten
|
||||
hide_form: Verberg formulier
|
||||
hide_form_title: 'Verberg formulier voor nieuwe context '
|
||||
hide_form_title: Verberg formulier voor nieuwe context
|
||||
last_completed_in_context: in deze context (laatste %{number})
|
||||
new_context_post: ''' zal ook gemaakt worden. Weet u dit zeker?'
|
||||
new_context_post: "' zal ook gemaakt worden. Weet u dit zeker?"
|
||||
new_context_pre: Nieuwe context '
|
||||
no_contexts_active: Momenteel zijn er geen actieve contexten
|
||||
no_contexts_hidden: Momenteel zijn er geen verborgen contexten
|
||||
|
|
@ -184,6 +184,7 @@ nl:
|
|||
data:
|
||||
import_errors: Er hebben zich fouten voorgedaan bij de import
|
||||
import_successful: De import was succesvol
|
||||
import_destination_invalid: Verkeerde bestemming voor import
|
||||
date:
|
||||
abbr_day_names:
|
||||
- Zo
|
||||
|
|
@ -194,7 +195,7 @@ nl:
|
|||
- Vr
|
||||
- Za
|
||||
abbr_month_names:
|
||||
-
|
||||
-
|
||||
- Jan
|
||||
- Feb
|
||||
- Maa
|
||||
|
|
@ -216,14 +217,14 @@ nl:
|
|||
- Vrijdag
|
||||
- Zaterdag
|
||||
formats:
|
||||
default: '%d-%m-%Y'
|
||||
long: '%e %B %Y'
|
||||
longer: '%A %d %B %Y'
|
||||
month_day: '%B %d'
|
||||
only_day: '%e'
|
||||
short: '%e %b'
|
||||
default: "%d-%m-%Y"
|
||||
long: "%e %B %Y"
|
||||
longer: "%A %d %B %Y"
|
||||
month_day: "%B %d"
|
||||
only_day: "%e"
|
||||
short: "%e %b"
|
||||
month_names:
|
||||
-
|
||||
-
|
||||
- Januari
|
||||
- Februari
|
||||
- Maart
|
||||
|
|
@ -268,16 +269,16 @@ nl:
|
|||
other: over %{count} jaren
|
||||
x_days:
|
||||
one: 1 dag
|
||||
other: '%{count} dagen'
|
||||
other: "%{count} dagen"
|
||||
x_minutes:
|
||||
one: 1 minuut
|
||||
other: '%{count} minuten'
|
||||
other: "%{count} minuten"
|
||||
x_months:
|
||||
one: 1 maand
|
||||
other: '%{count} maanden'
|
||||
other: "%{count} maanden"
|
||||
x_seconds:
|
||||
one: 1 seconde
|
||||
other: '%{count} seconden'
|
||||
other: "%{count} seconden"
|
||||
prompts:
|
||||
day: Dag
|
||||
hour: Uur
|
||||
|
|
@ -286,11 +287,10 @@ nl:
|
|||
second: Seconden
|
||||
year: Jaar
|
||||
errors:
|
||||
format: '%{attribute} %{message} '
|
||||
format: "%{attribute} %{message}"
|
||||
messages:
|
||||
accepted: moet geaccepteerd worden
|
||||
blank: kan niet leeg zijn
|
||||
confirmation: komt niet met bevestiging overeen
|
||||
empty: kan niet leeg zijn
|
||||
equal_to: moet gelijk zijn aan %{count}
|
||||
even: moet even zijn
|
||||
|
|
@ -307,6 +307,10 @@ nl:
|
|||
too_long: is te lang (maximum is %{count} karakters)
|
||||
too_short: is te kort (minimum is %{count} karakters)
|
||||
wrong_length: is de verkeerde lengte (zou %{count} karakters moeten zijn)
|
||||
confirmation: Komt niet met %{attribute} overeen
|
||||
other_than: moet anders zijn dan %{count}
|
||||
present: moet leeg zijn
|
||||
taken: is al bezet
|
||||
user_unauthorized: '401 Unauthorized: Alleen administratieve gebruikers mogen
|
||||
deze functie gebruiken.'
|
||||
feedlist:
|
||||
|
|
@ -339,10 +343,6 @@ nl:
|
|||
footer:
|
||||
send_feedback: Stuur reactie op %{version}
|
||||
helpers:
|
||||
button:
|
||||
create: Maak %{model}
|
||||
submit: Bewaar %{model}
|
||||
update: '%{model} bijwerken'
|
||||
select:
|
||||
prompt: Maak een keuze
|
||||
submit:
|
||||
|
|
@ -378,7 +378,7 @@ nl:
|
|||
export_title: Import en export van gegevens
|
||||
feeds: Feeds
|
||||
feeds_title: Zie een lijst met beschikbare feeds
|
||||
help: '?'
|
||||
help: "?"
|
||||
home: Start
|
||||
home_title: Start
|
||||
integrations_: Integreer Tracks
|
||||
|
|
@ -407,6 +407,8 @@ nl:
|
|||
show_empty_containers_context: Toon lege contexten
|
||||
show_empty_containers_project: Toon lege projecten
|
||||
show_empty_containers_title: Toon of verberg lege projecten of contexten
|
||||
import: import
|
||||
import_title: importeer gegevens
|
||||
next_actions_rss_feed: RSS-feed van de acties
|
||||
toggle_contexts: Toggle ingeklapte contexten
|
||||
toggle_contexts_title: Maak ingeklapte contexten (on)zichtbaar
|
||||
|
|
@ -426,7 +428,7 @@ nl:
|
|||
login_cas: Ga naar het CAS
|
||||
login_standard: Ga terug naar de standaard login
|
||||
login_with_openid: inloggen met een OpenID
|
||||
mobile_use_openid: '... if inloggen met een OpenID'
|
||||
mobile_use_openid: "... if inloggen met een OpenID"
|
||||
openid_identity_url_not_found: Sorry, geen gebruiker met die identiteit URL bestaat
|
||||
(%{identity_url})
|
||||
option_separator: of,
|
||||
|
|
@ -473,36 +475,35 @@ nl:
|
|||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: .
|
||||
format: '%u %n'
|
||||
delimiter: "."
|
||||
format: "%u %n"
|
||||
precision: 2
|
||||
separator: ','
|
||||
unit: €
|
||||
separator: ","
|
||||
unit: "€"
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
format:
|
||||
delimiter: .
|
||||
delimiter: "."
|
||||
precision: 3
|
||||
separator: ','
|
||||
separator: ","
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
human:
|
||||
decimal_units:
|
||||
format: '%n %u'
|
||||
format: "%n %u"
|
||||
units:
|
||||
billion: Biljoen
|
||||
million: Miljoen
|
||||
quadrillion: Quadriljoen
|
||||
thousand: Duizend
|
||||
trillion: Triljoen
|
||||
unit: false
|
||||
format:
|
||||
delimiter: .
|
||||
delimiter: "."
|
||||
precision: 1
|
||||
significant: true
|
||||
strip_insignificant_zeros: true
|
||||
storage_units:
|
||||
format: '%n %u'
|
||||
format: "%n %u"
|
||||
units:
|
||||
byte:
|
||||
one: Byte
|
||||
|
|
@ -513,10 +514,7 @@ nl:
|
|||
tb: TB
|
||||
percentage:
|
||||
format:
|
||||
delimiter: false
|
||||
precision:
|
||||
format:
|
||||
delimiter: false
|
||||
format: "%n%"
|
||||
preferences:
|
||||
authentication_header: Uw authenticatie
|
||||
change_authentication_type: Verander uw authenticatietype
|
||||
|
|
@ -597,7 +595,7 @@ nl:
|
|||
with_default_tags: en met '%{tags}' als de standaard tags
|
||||
with_no_default_context: zonder standaard context
|
||||
with_no_default_tags: en zonder standaard tags
|
||||
last_completed_in_project: (laatste %{number})
|
||||
last_completed_in_project: "(laatste %{number})"
|
||||
search:
|
||||
contexts_matching_query: Contexten passend bij zoekopdracht
|
||||
no_results: Uw zoekopdracht heeft geen resultaten opgeleverd.
|
||||
|
|
@ -701,8 +699,8 @@ nl:
|
|||
avg_created: Gem gemaakt
|
||||
completed: Afgerond
|
||||
created: Gemaakt
|
||||
month_avg_completed: '%{months} gem afgerond per maand'
|
||||
month_avg_created: '%{months} gem gemaakt per maand'
|
||||
month_avg_completed: "%{months} gem afgerond per maand"
|
||||
month_avg_created: "%{months} gem gemaakt per maand"
|
||||
legend:
|
||||
actions: Acties
|
||||
day_of_week: Dag van de week
|
||||
|
|
@ -719,7 +717,7 @@ nl:
|
|||
open_per_week_legend:
|
||||
actions: Acties
|
||||
weeks: Weken geleden
|
||||
other_actions_label: (anderen)
|
||||
other_actions_label: "(anderen)"
|
||||
projects: Projecten
|
||||
running_time_all: Huidige looptijd van alle onvolledige acties
|
||||
running_time_all_legend:
|
||||
|
|
@ -756,15 +754,15 @@ nl:
|
|||
acties
|
||||
totals: Totalen
|
||||
totals_action_count: u heeft een totaal van %{count} acties
|
||||
totals_actions_completed: '%{count} van deze zijn voltooid.'
|
||||
totals_actions_completed: "%{count} van deze zijn voltooid."
|
||||
totals_active_project_count: Van deze zijn %{count} actieve projecten
|
||||
totals_blocked_actions: '%{count} zijn afhankelijk van de voltooiing van hun acties.'
|
||||
totals_blocked_actions: "%{count} zijn afhankelijk van de voltooiing van hun acties."
|
||||
totals_completed_project_count: en %{count} zijn afgeronde projecten.
|
||||
totals_context_count: U heeft %{count} contexten.
|
||||
totals_deferred_actions: waarvan %{count} uitgestelde acties in de tickler zijn
|
||||
totals_first_action: Sinds uw eerste actie op %{date}
|
||||
totals_hidden_context_count: en %{count} zijn verborgen contexten.
|
||||
totals_hidden_project_count: '%{count} zijn verborgen'
|
||||
totals_hidden_project_count: "%{count} zijn verborgen"
|
||||
totals_incomplete_actions: U heeft %{count} onvolledige acties
|
||||
totals_project_count: U heeft %{count} projecten.
|
||||
totals_tag_count: U heeft %{count} tags geplaatst op acties.
|
||||
|
|
@ -773,26 +771,26 @@ nl:
|
|||
within_one: Binnen 1
|
||||
support:
|
||||
array:
|
||||
last_word_connector: ', en'
|
||||
last_word_connector: ", en"
|
||||
two_words_connector: en
|
||||
words_connector: ','
|
||||
words_connector: ","
|
||||
select:
|
||||
prompt: Selecteer
|
||||
time:
|
||||
am: ochtend
|
||||
formats:
|
||||
default: '%A, %d %B %Y %H:%M:%S %z'
|
||||
long: '%A, %d. %B %Y, %H:%M'
|
||||
month_day: '%d %B'
|
||||
short: '%d %B %H:%M'
|
||||
stats: '%a %d-%m'
|
||||
time: '%H:%M'
|
||||
default: "%A, %d %B %Y %H:%M:%S %z"
|
||||
long: "%A, %d. %B %Y, %H:%M"
|
||||
month_day: "%d %B"
|
||||
short: "%d %B %H:%M"
|
||||
stats: "%a %d-%m"
|
||||
time: "%H:%M"
|
||||
pm: middag
|
||||
todos:
|
||||
action_deferred: De actie '%{description}' is uitgesteld
|
||||
action_deleted_error: Verwijderen van de actie is mislukt
|
||||
action_deleted_success: Actie succesvol verwijderd
|
||||
action_due_on: (deadline actie op %{date})
|
||||
action_due_on: "(deadline actie op %{date})"
|
||||
action_marked_complete: De actie <strong>'%{description}'</strong> werd gemarkeerd
|
||||
als <strong>%{completed}</strong>
|
||||
action_marked_complete_error: De actie <strong>'%{description}'</strong> is niet
|
||||
|
|
@ -801,7 +799,7 @@ nl:
|
|||
action_saved_to_tickler: Actie opgeslagen in tickler
|
||||
add_another_dependency: Nog een afhankelijkheid toevoegen
|
||||
add_new_recurring: Voeg een nieuwe terugkerende actie toe
|
||||
added_dependency: '%{dependency} als afhankelijkheid toegevoegd.'
|
||||
added_dependency: "%{dependency} als afhankelijkheid toegevoegd."
|
||||
added_new_context: Nieuwe context toegevoegd
|
||||
added_new_next_action: Nieuwe actie toegevoegd
|
||||
added_new_next_action_plural: Nieuwe acties toegevoegd
|
||||
|
|
@ -848,7 +846,7 @@ nl:
|
|||
bewerken alvorens uitsteldatum aan te passen.
|
||||
defer_x_days:
|
||||
one: Een dag uitstellen
|
||||
other: '%{count} dagen uitstellen'
|
||||
other: "%{count} dagen uitstellen"
|
||||
deferred_actions_with: Uitgestelde acties met de tag '%{tag_name}'
|
||||
deferred_pending_actions: Uitgestelde/wachtende acties
|
||||
deferred_tasks_title: TRACKS::Tickler
|
||||
|
|
@ -921,7 +919,7 @@ nl:
|
|||
due_within_a_week: deadline binnen een week
|
||||
no_actions_due_this_week: Geen acties met deadline in rest van deze week
|
||||
no_last_completed_actions: Geen afgeronde acties gevonden
|
||||
no_project: -- Geen project --
|
||||
no_project: "-- Geen project --"
|
||||
overdue: Achterstallig
|
||||
pending: Wachtend
|
||||
recurrence:
|
||||
|
|
@ -957,7 +955,7 @@ nl:
|
|||
from: vanaf
|
||||
last: laatste
|
||||
month_names:
|
||||
-
|
||||
-
|
||||
- januari
|
||||
- februari
|
||||
- maart
|
||||
|
|
@ -988,7 +986,7 @@ nl:
|
|||
yearly_every_xth_day: De %{day} %{day_of_week} van %{month}
|
||||
yearly_options: Instellingen voor jaarlijks terugkerende acties
|
||||
recurrence_on:
|
||||
due_date: 'de deadline van de actie '
|
||||
due_date: de deadline van de actie
|
||||
from_tickler: de datum wanneer de actie getoond moet worden (geen deadline)
|
||||
options: Gebruik de berekende datum voor
|
||||
show_always: altijd
|
||||
|
|
@ -1005,10 +1003,10 @@ nl:
|
|||
recurring_pattern_removed: Het herhalingspatroon is verwijderd van %{count}
|
||||
recurring_todos: Terugkerende acties
|
||||
remove_dependency: Verwijder afhankelijkheid (zal niet de actie zelf verwijderen)
|
||||
removed_predecessor: '''%{successor}'' is verwijderd als afhankelijkheid van ''%{predecessor}''.'
|
||||
removed_predecessor: "'%{successor}' is verwijderd als afhankelijkheid van '%{predecessor}'."
|
||||
scheduled_overdue: Gepland om %{days} dagen geleden te tonen
|
||||
see_all_completed: Je kan alle afgeronde acties %{link} zien
|
||||
set_to_pending: '''%{task}'' als wachtend ingesteld'
|
||||
set_to_pending: "'%{task}' als wachtend ingesteld"
|
||||
show_from: Toon vanaf
|
||||
show_in_days: Toon over %{days} dagen
|
||||
show_on_date: Toon op %{date}
|
||||
|
|
@ -1022,8 +1020,8 @@ nl:
|
|||
task_list_title: TRACKS::Toon acties
|
||||
tickler_items_due:
|
||||
one: Een tickler item wordt nu zichtbaar - vernieuw de pagina om het te zien.
|
||||
other: '%{count} tickerl items zijn nu zichtbaar - vernieuw de pagina om ze
|
||||
te zien.'
|
||||
other: "%{count} tickerl items zijn nu zichtbaar - vernieuw de pagina om ze
|
||||
te zien."
|
||||
to_tickler: naar tickler
|
||||
unable_to_add_dependency: Niet in staat om de afhankelijkheid toe te voegen
|
||||
unresolved_dependency: De waarde die u ingevoerd heeft in het afhankelijkheden
|
||||
|
|
@ -1042,6 +1040,7 @@ nl:
|
|||
tag_completed: Afgeronde acties getagged met '%{param}'
|
||||
tag_deferred_pending: Uitgestelde/wachtende acties getagged met '%{param}'
|
||||
tag_hidden: Verborgen acties getagged met '%{param}'
|
||||
context_without_project: Acties zonder project in %{param}
|
||||
no_actions:
|
||||
completed: Momenteel zijn er geen afgeronde acties
|
||||
completed_recurring: Momenteel zijn er geen afgeronden herhalende acties
|
||||
|
|
@ -1063,6 +1062,11 @@ nl:
|
|||
tag_hidden: Momenteel zijn er geen verborgen acties
|
||||
title: Geen acties gevonden
|
||||
without_project: Momenteel zijn er geen acties zonder project
|
||||
not_done_context: Momenteel zijn er geen openstaande acties in deze context
|
||||
not_done_project: Momenteel zijn er geen openstaande acties in dit project
|
||||
error:
|
||||
invalid_due_date: Ongeldige deadline datum
|
||||
invalid_show_from_date: Ongeldige datum voor tonen vanaf
|
||||
users:
|
||||
account_signup: Aanmelden voor een account
|
||||
auth_change_submit: Wijzigen authenticatietype
|
||||
|
|
@ -1130,5 +1134,5 @@ nl:
|
|||
one: Toon <b>1</b> %{model}
|
||||
other: Toon <b>alle %{count}</b> %{model}
|
||||
zero: Geen %{model} gevonden
|
||||
page_gap: '…'
|
||||
previous_label: «Vorige
|
||||
page_gap: "…"
|
||||
previous_label: "«Vorige"
|
||||
|
|
|
|||
42
db/schema.rb
42
db/schema.rb
|
|
@ -15,7 +15,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do
|
|||
|
||||
create_table "contexts", force: true do |t|
|
||||
t.string "name", null: false
|
||||
t.integer "position"
|
||||
t.integer "position", default: 0
|
||||
t.integer "user_id", default: 1
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
|
|
@ -85,11 +85,11 @@ ActiveRecord::Schema.define(version: 20130227205845) do
|
|||
add_index "preferences", ["user_id"], name: "index_preferences_on_user_id", using: :btree
|
||||
|
||||
create_table "projects", force: true do |t|
|
||||
t.string "name", null: false
|
||||
t.integer "position"
|
||||
t.integer "user_id", default: 1
|
||||
t.text "description"
|
||||
t.string "state", limit: 20, null: false
|
||||
t.string "name", null: false
|
||||
t.integer "position", default: 0
|
||||
t.integer "user_id", default: 1
|
||||
t.text "description", limit: 16777215
|
||||
t.string "state", limit: 20, null: false
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.integer "default_context_id"
|
||||
|
|
@ -104,17 +104,17 @@ ActiveRecord::Schema.define(version: 20130227205845) do
|
|||
add_index "projects", ["user_id"], name: "index_projects_on_user_id", using: :btree
|
||||
|
||||
create_table "recurring_todos", force: true do |t|
|
||||
t.integer "user_id", default: 1
|
||||
t.integer "context_id", null: false
|
||||
t.integer "user_id", default: 1
|
||||
t.integer "context_id", null: false
|
||||
t.integer "project_id"
|
||||
t.string "description", null: false
|
||||
t.text "notes"
|
||||
t.string "state", limit: 20, null: false
|
||||
t.string "description", null: false
|
||||
t.text "notes", limit: 16777215
|
||||
t.string "state", limit: 20, null: false
|
||||
t.datetime "start_from"
|
||||
t.string "ends_on"
|
||||
t.datetime "end_date"
|
||||
t.integer "number_of_occurences"
|
||||
t.integer "occurences_count", default: 0
|
||||
t.integer "occurences_count", default: 0
|
||||
t.string "target"
|
||||
t.integer "show_from_delta"
|
||||
t.string "recurring_period"
|
||||
|
|
@ -123,7 +123,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do
|
|||
t.integer "every_other2"
|
||||
t.integer "every_other3"
|
||||
t.string "every_day"
|
||||
t.boolean "only_work_days", default: false
|
||||
t.boolean "only_work_days", default: false
|
||||
t.integer "every_count"
|
||||
t.integer "weekday"
|
||||
t.datetime "completed_at"
|
||||
|
|
@ -141,7 +141,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do
|
|||
t.datetime "updated_at"
|
||||
end
|
||||
|
||||
add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
|
||||
add_index "sessions", ["session_id"], name: "sessions_session_id_index", using: :btree
|
||||
|
||||
create_table "taggings", force: true do |t|
|
||||
t.integer "taggable_id"
|
||||
|
|
@ -162,19 +162,19 @@ ActiveRecord::Schema.define(version: 20130227205845) do
|
|||
add_index "tags", ["name"], name: "index_tags_on_name", using: :btree
|
||||
|
||||
create_table "todos", force: true do |t|
|
||||
t.integer "context_id", null: false
|
||||
t.integer "context_id", null: false
|
||||
t.integer "project_id"
|
||||
t.string "description", null: false
|
||||
t.text "notes"
|
||||
t.string "description", null: false
|
||||
t.text "notes", limit: 16777215
|
||||
t.datetime "created_at"
|
||||
t.datetime "due"
|
||||
t.datetime "completed_at"
|
||||
t.integer "user_id", default: 1
|
||||
t.integer "user_id", default: 1
|
||||
t.datetime "show_from"
|
||||
t.string "state", limit: 20, null: false
|
||||
t.string "state", limit: 20, null: false
|
||||
t.integer "recurring_todo_id"
|
||||
t.datetime "updated_at"
|
||||
t.text "rendered_notes"
|
||||
t.text "rendered_notes", limit: 16777215
|
||||
end
|
||||
|
||||
add_index "todos", ["context_id"], name: "index_todos_on_context_id", using: :btree
|
||||
|
|
@ -212,7 +212,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do
|
|||
|
||||
create_table "users", force: true do |t|
|
||||
t.string "login", limit: 80, null: false
|
||||
t.string "crypted_password", limit: 60, null: false
|
||||
t.string "crypted_password", limit: 60
|
||||
t.string "token"
|
||||
t.boolean "is_admin", default: false, null: false
|
||||
t.string "first_name"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ That said. To upgrade:
|
|||
|
||||
Please note that if you intend to use Tracks with the built in webserver called WEBrick for production, you'll need to change @config.serve_static_assets@ to @true@ in @config/environments/production.rb@ in order for the images, stylesheets, and javascript files to be served correctly.
|
||||
|
||||
The Czech locale has been renamed from @cz@ to @cs@ in accordance with ISO standards. Users of the Czech locale will need to edit their preferences and reselct the locale under the new name.
|
||||
The Czech locale has been renamed from @cz@ to @cs@ in accordance with ISO standards. Users of the Czech locale will need to edit their preferences and reselect the locale under the new name.
|
||||
|
||||
h2. Upgrading from Tracks 2.2 to 2.2.1 and to 2.2.2
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ Feature: Show all due actions in a calendar view
|
|||
When I clear the due date of "something new"
|
||||
Then I should not see the todo "something new"
|
||||
|
||||
@javascript
|
||||
@javascript
|
||||
Scenario: Deleting a todo will remove it from the calendar
|
||||
Given I have a todo "something new" in the context "@calendar" which is due tomorrow
|
||||
When I go to the calendar page
|
||||
|
|
|
|||
|
|
@ -52,10 +52,8 @@ Feature: Edit a next action from every page
|
|||
| context | container for context "@home" |
|
||||
| project | container for project "do it!" |
|
||||
|
||||
@javascript @wip
|
||||
@javascript
|
||||
Scenario Outline: Changing container of the todo in that container will hide it
|
||||
# this script fails on https://code.google.com/p/selenium/issues/detail?id=3075 for selenium-webdriver > 2.14.
|
||||
# and selenium-webdriver < 2.20 fails on firefox 11 :-( So @wip for now. This may work with webkit though
|
||||
Given I have a todo "delete me" in the context "@home" in the project "do it"
|
||||
And I have a project "go for it"
|
||||
And I have selected the view for group by <grouping>
|
||||
|
|
@ -247,10 +245,8 @@ Feature: Edit a next action from every page
|
|||
When I go to the tickler page
|
||||
Then I should see the todo "start later"
|
||||
|
||||
@javascript @wip
|
||||
@javascript
|
||||
Scenario: I can defer a todo
|
||||
# this script fails on https://code.google.com/p/selenium/issues/detail?id=3075 for selenium-webdriver > 2.14.
|
||||
# and selenium-webdriver < 2.20 fails on firefox 11 :-( So @wip for now. This will work on webkit though
|
||||
When I go to the home page
|
||||
And I submit a new action with description "start later" in the context "@pc"
|
||||
And I defer "start later" for 1 day
|
||||
|
|
@ -258,10 +254,8 @@ Feature: Edit a next action from every page
|
|||
When I go to the tickler page
|
||||
Then I should see "start later"
|
||||
|
||||
@javascript @wip
|
||||
@javascript
|
||||
Scenario: I can make a project from a todo
|
||||
# this script fails on https://code.google.com/p/selenium/issues/detail?id=3075 for selenium-webdriver > 2.14.
|
||||
# and selenium-webdriver < 2.20 fails on firefox 11 :-( So @wip for now. This will work on webkit though
|
||||
When I go to the home page
|
||||
And I submit a new action with description "buy mediacenter" in the context "@pc"
|
||||
And I make a project of "buy mediacenter"
|
||||
|
|
|
|||
|
|
@ -192,9 +192,9 @@ Feature: Add new next action from every page
|
|||
And I have selected the view for group by <grouping>
|
||||
When I go to the <page>
|
||||
And I submit a new action with description "hidden todo" to project "hidden project" with tags "test" in the context "visible context"
|
||||
Then I should <see_hidden> "hidden todo"
|
||||
Then I should <see_hidden> the todo "hidden todo"
|
||||
When I submit a new action with description "visible todo" to project "visible project" with tags "test" in the context "visible context"
|
||||
Then I should <see_visible> "visible todo"
|
||||
Then I should <see_visible> the todo "visible todo"
|
||||
|
||||
Scenarios:
|
||||
| page | grouping | see_hidden | see_visible |
|
||||
|
|
|
|||
|
|
@ -73,6 +73,14 @@ Then /^I should not see a project named "([^"]*)"$/ do |project_name|
|
|||
step "I should see that a project named \"#{project_name}\" is not present"
|
||||
end
|
||||
|
||||
Then(/^I should not see the project "(.*?)"$/) do |project_name|
|
||||
project = @current_user.projects.where(:name => project_name).first
|
||||
project.should_not be_nil
|
||||
|
||||
project_xpath = "//div[@id='project_#{project.id}']"
|
||||
page.should_not have_xpath(project_xpath)
|
||||
end
|
||||
|
||||
Then /^the project "([^"]*)" should be above the project "([^"]*)"$/ do |project_high, project_low|
|
||||
project_list_find_index(project_high).should < project_list_find_index(project_low)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ When /^I delete the action "([^"]*)"$/ do |action_description|
|
|||
get_confirm_text.should == "Are you sure that you want to delete the action '#{todo.description}'?"
|
||||
|
||||
wait_for_ajax
|
||||
# commented out: the notice is gone if you want to check for it
|
||||
# wait_for_animations_to_end
|
||||
end
|
||||
|
||||
When /^I delete the todo "([^"]*)"$/ do |action_description|
|
||||
|
|
|
|||
|
|
@ -115,10 +115,12 @@ module TracksStepHelper
|
|||
end
|
||||
|
||||
def open_submenu_for(todo)
|
||||
wait_for_animations_to_end
|
||||
|
||||
submenu_arrow = "div#line_todo_#{todo.id} img.todo-submenu"
|
||||
page.should have_css(submenu_arrow, :visible=>true)
|
||||
page.find(submenu_arrow, :match => :first).click
|
||||
sleep 0.1
|
||||
arrow = page.find(submenu_arrow, :match => :first)
|
||||
arrow.click
|
||||
|
||||
submenu_css = "div#line_todo_#{todo.id} ul#ultodo_#{todo.id}"
|
||||
submenu = page.find(submenu_css)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ Feature: Tagging todos
|
|||
Scenario: I can add a new todo from tag view with a different tag and it will not be added to the page
|
||||
When I go to the tag page for "tracks"
|
||||
And I submit a new action with description "prepare release" and the tags "release, next" in the context "@pc"
|
||||
Then I should not see "prepare release"
|
||||
Then I should not see the todo "prepare release"
|
||||
|
||||
@javascript
|
||||
Scenario: I can move a tagged todo in tag view to a hidden project and it will move the todo on the page to the hidden container
|
||||
|
|
|
|||
|
|
@ -136,9 +136,9 @@ Feature: Show done
|
|||
@javascript
|
||||
Scenario Outline: I can toggle a todo active from the done pages
|
||||
When I go to the <page>
|
||||
Then I should see "todo 1"
|
||||
Then I should see the todo "todo 1"
|
||||
When I mark the completed todo "todo 1" active
|
||||
Then I should not see "todo 1"
|
||||
Then I should not see the todo "todo 1"
|
||||
When I go to the <next page>
|
||||
Then I should see "todo 1" <where>
|
||||
|
||||
|
|
@ -163,13 +163,13 @@ Feature: Show done
|
|||
And I should see "todo 2" in the done this week container
|
||||
And I should see "todo 3" in the done this month container
|
||||
When I mark the completed todo "todo 1" active
|
||||
Then I should not see "todo 1"
|
||||
Then I should not see the todo "todo 1"
|
||||
And I should see empty message for done today of done actions
|
||||
When I mark the completed todo "todo 2" active
|
||||
Then I should not see "todo 2"
|
||||
Then I should not see the todo "todo 2"
|
||||
And I should see empty message for done this week of done actions
|
||||
When I mark the completed todo "todo 3" active
|
||||
Then I should not see "todo 3"
|
||||
Then I should not see the todo "todo 3"
|
||||
And I should see empty message for done this month of done actions
|
||||
|
||||
@javascript
|
||||
|
|
@ -196,7 +196,7 @@ Feature: Show done
|
|||
When I go to the done projects page
|
||||
Then I should see "completed project"
|
||||
When I edit the project state of "completed project" to "active"
|
||||
Then I should not see "completed project"
|
||||
Then I should not see the project "completed project"
|
||||
When I go to the projects page
|
||||
Then I should see "completed project"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ task :ci do |t|
|
|||
SimpleCov.start 'rails'
|
||||
|
||||
[:environment, 'db:migrate', 'test:all', 'cucumber'].each do |t|
|
||||
print "running '#{t}'\n"
|
||||
Rake::Task[t].invoke
|
||||
end
|
||||
end
|
||||
24
lib/tasks/reset_password.rake
Normal file
24
lib/tasks/reset_password.rake
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
namespace :tracks do
|
||||
desc 'Replace the password of USER with a new one.'
|
||||
task :password => :environment do
|
||||
require "highline/import"
|
||||
|
||||
user = User.find_by_login(ENV['USER'])
|
||||
if user.nil?
|
||||
puts "Sorry, we couldn't find user '#{ENV['USER']}'. To specify a different user, pass USER=username to this task."
|
||||
exit 0
|
||||
end
|
||||
|
||||
puts "Changing Tracks password for #{ENV['USER']}."
|
||||
password = ask("New password: ") { |q| q.echo = false }
|
||||
password_confirmation = ask('Retype new password: ') { |q| q.echo = false }
|
||||
|
||||
begin
|
||||
user.change_password(password, password_confirmation)
|
||||
rescue ActiveRecord::RecordInvalid
|
||||
puts "Sorry, we couldn't change #{ENV['USER']}'s password: "
|
||||
user.errors.each_full { |msg| puts "- #{msg}\n" }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
class DoneTodos
|
||||
|
||||
|
||||
def self.done_todos_for_container(user)
|
||||
completed_todos = user.todos.completed
|
||||
def self.done_todos_for_container(todos)
|
||||
completed_todos = todos.completed
|
||||
return done_today(completed_todos), done_rest_of_week(completed_todos), done_rest_of_month(completed_todos)
|
||||
end
|
||||
|
||||
|
|
@ -29,8 +29,8 @@ class DoneTodos
|
|||
return nil
|
||||
end
|
||||
|
||||
def self.remaining_in_container(user, period)
|
||||
count = self.send("done_#{period}", user.todos.completed, {}).count
|
||||
def self.remaining_in_container(todos, period)
|
||||
count = self.send("done_#{period}", todos.completed, {}).count
|
||||
return nil if period.nil?
|
||||
return count
|
||||
end
|
||||
|
|
|
|||
|
|
@ -641,7 +641,8 @@ class TodosControllerTest < ActionController::TestCase
|
|||
"due(1i)"=>"2007", "due(2i)"=>"1", "due(3i)"=>"2",
|
||||
"show_from(1i)"=>"", "show_from(2i)"=>"", "show_from(3i)"=>"",
|
||||
"project_id"=>"1",
|
||||
"notes"=>"test notes", "description"=>"test_mobile_create_action", "state"=>"0"}}
|
||||
"notes"=>"test notes", "description"=>"test_mobile_create_action"}}
|
||||
|
||||
assert_redirected_to '/mobile'
|
||||
end
|
||||
|
||||
|
|
@ -714,41 +715,42 @@ class TodosControllerTest < ActionController::TestCase
|
|||
end
|
||||
|
||||
def test_toggle_check_on_rec_todo_show_from_today
|
||||
login_as(:admin_user)
|
||||
Timecop.travel(2014, 1, 15) do
|
||||
login_as(:admin_user)
|
||||
|
||||
# link todo_1 and recurring_todo_1
|
||||
recurring_todo_1 = RecurringTodo.find(1)
|
||||
todo_1 = Todo.where(:recurring_todo_id => 1).first
|
||||
today = Time.zone.now.at_midnight - 1.day
|
||||
# link todo_1 and recurring_todo_1
|
||||
recurring_todo_1 = RecurringTodo.find(1)
|
||||
todo_1 = Todo.where(:recurring_todo_id => 1).first
|
||||
today = Time.zone.now.at_midnight
|
||||
todo_1.due = today
|
||||
assert todo_1.save
|
||||
|
||||
# change recurrence pattern to monthly and set show_from to today
|
||||
recurring_todo_1.target = 'show_from_date'
|
||||
recurring_todo_1.recurring_period = 'monthly'
|
||||
recurring_todo_1.recurrence_selector = 0
|
||||
recurring_todo_1.every_other1 = today.day
|
||||
recurring_todo_1.every_other2 = 1
|
||||
assert recurring_todo_1.save
|
||||
# change recurrence pattern to monthly and set show_from to today
|
||||
recurring_todo_1.target = 'show_from_date'
|
||||
recurring_todo_1.recurring_period = 'monthly'
|
||||
recurring_todo_1.recurrence_selector = 0
|
||||
recurring_todo_1.every_other1 = today.day
|
||||
recurring_todo_1.every_other2 = 1
|
||||
assert recurring_todo_1.save
|
||||
|
||||
# mark todo_1 as complete by toggle_check
|
||||
xhr :post, :toggle_check, :id => todo_1.id, :_source_view => 'todo'
|
||||
todo_1.reload
|
||||
assert todo_1.completed?
|
||||
# mark todo_1 as complete by toggle_check
|
||||
xhr :post, :toggle_check, :id => todo_1.id, :_source_view => 'todo'
|
||||
todo_1.reload
|
||||
assert todo_1.completed?
|
||||
|
||||
# locate the new todo in tickler
|
||||
new_todo = Todo.where(:recurring_todo_id => recurring_todo_1.id, :state => 'deferred').first
|
||||
assert !new_todo.nil?
|
||||
# locate the new todo in tickler
|
||||
new_todo = Todo.where(:recurring_todo_id => recurring_todo_1.id, :state => 'deferred').first
|
||||
assert !new_todo.nil?, "the todo should be in the tickler"
|
||||
|
||||
assert_equal "Call Bill Gates every day", new_todo.description
|
||||
# check that the new todo is not the same as todo_1
|
||||
assert_not_equal todo_1.id, new_todo.id
|
||||
assert_equal "Call Bill Gates every day", new_todo.description
|
||||
assert_not_equal todo_1.id, new_todo.id, "check that the new todo is not the same as todo_1"
|
||||
assert !new_todo.show_from.nil?, "check that the new_todo is in the tickler to show next month"
|
||||
|
||||
# check that the new_todo is in the tickler to show next month
|
||||
assert !new_todo.show_from.nil?
|
||||
# do not use today here. It somehow gets messed up with the timezone calculation.
|
||||
next_month = (Time.zone.now + 1.month).at_midnight
|
||||
|
||||
# do not use today here. It somehow gets messed up with the timezone calculation.
|
||||
next_month = (Time.zone.now - 1.day + 1.month).at_midnight
|
||||
|
||||
assert_equal next_month.utc.to_date.to_s(:db), new_todo.show_from.utc.to_date.to_s(:db)
|
||||
assert_equal next_month.utc.to_date.to_s(:db), new_todo.show_from.utc.to_date.to_s(:db)
|
||||
end
|
||||
end
|
||||
|
||||
def test_check_for_next_todo
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ class RichMessageExtractorTest < Test::Unit::TestCase
|
|||
assert_equal "ohai", extractor.description
|
||||
assert_equal "some-context", extractor.context
|
||||
assert_equal "this-project", extractor.project
|
||||
assert_equal "2013-10-12", extractor.show_from.to_s
|
||||
assert_equal "2013-10-14", extractor.due.to_s
|
||||
assert_equal Time.zone.parse("2013-10-12").utc.to_s, extractor.show_from.utc.to_s
|
||||
assert_equal Time.zone.parse("2013-10-14").utc.to_s, extractor.due.utc.to_s
|
||||
assert_equal ["tag1","tag2"], extractor.tags
|
||||
assert extractor.starred?
|
||||
end
|
||||
|
|
@ -72,7 +72,7 @@ class RichMessageExtractorTest < Test::Unit::TestCase
|
|||
def test_message_with_due_date
|
||||
message = "datetest<141013"
|
||||
extractor = RichMessageExtractor.new(message)
|
||||
assert_equal "2014-10-13", extractor.due.to_s
|
||||
assert_equal Time.zone.parse("2014-10-13").utc.to_s, extractor.due.utc.to_s
|
||||
end
|
||||
|
||||
def test_message_with_no_due_date
|
||||
|
|
@ -84,7 +84,7 @@ class RichMessageExtractorTest < Test::Unit::TestCase
|
|||
def test_message_with_show_from
|
||||
message = "datetest>161013"
|
||||
extractor = RichMessageExtractor.new(message)
|
||||
assert_equal "2016-10-13", extractor.show_from.to_s
|
||||
assert_equal Time.zone.parse("2016-10-13").utc.to_s, extractor.show_from.utc.to_s
|
||||
end
|
||||
|
||||
def test_message_with_no_show_from
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ class TodoFromRichMessageTest < ActiveSupport::TestCase
|
|||
assert_equal "notes", new_todo.notes
|
||||
assert_equal context.id, new_todo.context_id
|
||||
assert_equal project.id, new_todo.project_id
|
||||
assert_equal "2013-10-14 00:00:00 +0100", new_todo.show_from.to_s
|
||||
assert_equal "2013-10-17 00:00:00 +0100", new_todo.due.to_s
|
||||
assert_equal Time.zone.parse("2013-10-14 00:00"). utc.to_s, new_todo.show_from.utc.to_s
|
||||
assert_equal Time.zone.parse("2013-10-17 00:00"), new_todo.due.utc.to_s
|
||||
assert_equal "starred, tag1, tag2", new_todo.tags.to_s
|
||||
assert new_todo.starred?
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue