From e92b22ea30b2ccbea46162f25d9794746d4eede2 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 28 Jun 2019 00:31:00 +0300 Subject: [PATCH 001/767] #2259: Use a Chartjs-ror version with airblade/chartjs-ror#57 applied. Adds a container around each chart allowing to enable responsivity and get a less fuzzy chart. --- Gemfile | 2 +- Gemfile.lock | 12 +++++++++--- app/views/stats/_actions.html.erb | 2 -- app/views/stats/_contexts.html.erb | 2 -- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 50f48727..355d051f 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem 'paperclip' # To use ActiveModel has_secure_password gem 'bcrypt', '~> 3.1.13' -gem 'chartjs-ror' +gem 'chartjs-ror', :github => 'ZeiP/chartjs-ror', :branch => 'bug/41_container_element' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index 74473b18..c106467e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: git://github.com/ZeiP/chartjs-ror.git + revision: e9d3aabbda3059c001144833d915a386d8b511c5 + branch: bug/41_container_element + specs: + chartjs-ror (3.6.4) + rails (>= 3.1) + GEM remote: https://rubygems.org/ specs: @@ -66,8 +74,6 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.0.1) - chartjs-ror (3.6.4) - rails (>= 3.1) childprocess (1.0.1) rake (< 13.0) climate_control (0.2.0) @@ -277,7 +283,7 @@ DEPENDENCIES bootstrap-sass (= 3.4.1) bullet byebug - chartjs-ror + chartjs-ror! codeclimate-test-reporter (= 1.0.7) coffee-rails (~> 4.2.0) database_cleaner diff --git a/app/views/stats/_actions.html.erb b/app/views/stats/_actions.html.erb index 1daf9b7f..2cdff002 100644 --- a/app/views/stats/_actions.html.erb +++ b/app/views/stats/_actions.html.erb @@ -3,8 +3,6 @@ options = { width: "400px", height: "400px", - maintainAspectRatio: false, - responsive: false, plugins: { colorschemes: { scheme: 'brewer.Paired12', diff --git a/app/views/stats/_contexts.html.erb b/app/views/stats/_contexts.html.erb index 54dfa730..7049afd8 100644 --- a/app/views/stats/_contexts.html.erb +++ b/app/views/stats/_contexts.html.erb @@ -15,8 +15,6 @@ Stats::TopContextsQuery.new(current_user).result.map { |context| options = { width: "400px", height: "400px", - maintainAspectRatio: false, - responsive: false, plugins: { colorschemes: { scheme: 'brewer.Paired12', From 9f3d181fdc3372538351dae7cbca9d3c28d364f3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2019 03:01:54 +0000 Subject: [PATCH 002/767] [Security] Bump loofah from 2.2.3 to 2.3.1 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1. **This update includes a security fix.** - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff84004b..e5d7d3b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) database_cleaner (1.7.0) diff-lcs (1.3) docile (1.3.2) @@ -113,7 +113,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) From 79ac907346d4d20c9edff5f7bcfc7d1a18dcffda Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Wed, 30 Oct 2019 20:45:50 -0400 Subject: [PATCH 003/767] Migrate CI to GitHub Actions --- .github/workflows/continuous-integration.yml | 11 ++++++++++ .travis.yml | 21 -------------------- Dockerfile | 2 +- README.md | 2 +- script/cibuild | 6 +++--- 5 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/continuous-integration.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml new file mode 100644 index 00000000..cf1ea945 --- /dev/null +++ b/.github/workflows/continuous-integration.yml @@ -0,0 +1,11 @@ +--- +name: Continuous Integration + +on: push + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash -x script/cibuild diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d58dddc9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -sudo: true -services: - - docker -env: - - DOCKER_COMPOSE_VERSION=1.21.0 -before_install: - - sudo rm /usr/local/bin/docker-compose - - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - - chmod 0755 docker-compose - - sudo mv docker-compose /usr/local/bin -install: true -script: "script/cibuild" -addons: - apt: - packages: - - docker-ce -notifications: - email: false - #irc: - #channels: "chat.freenode.net#tracks" - #skip_join: true diff --git a/Dockerfile b/Dockerfile index 37c63310..739c978f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN touch /etc/app-env COPY Gemfile* /app/ RUN gem install bundler -RUN bundle install +RUN bundle install --jobs 4 RUN mkdir /app/log diff --git a/README.md b/README.md index 61c11321..6b1b8095 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors * Version: 2.4.0 -[![Build Status](https://travis-ci.org/TracksApp/tracks.svg?branch=master)](https://travis-ci.org/TracksApp/tracks) +[![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions) [![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks) Full instructions for both new installations and upgrades from older installations of Tracks diff --git a/script/cibuild b/script/cibuild index 702cf364..af04b27a 100755 --- a/script/cibuild +++ b/script/cibuild @@ -26,8 +26,8 @@ $docker_compose up -d script/poll-for-db # Leaving this in since it will be needed for Rails 5 -bin/rails db:environment:set RAILS_ENV=test || true +$docker_compose run web bin/rails db:environment:set RAILS_ENV=test || true -bin/rake db:reset -bin/rake test +$docker_compose run web bin/rake db:reset +$docker_compose run web bin/rake test From b94f2cdcfd16f852fe06692adf81806c9f135bb3 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 6 Nov 2019 01:32:46 +0200 Subject: [PATCH 004/767] #2295: Fix for the migration bug in MySQL --- db/migrate/20190618202817_add_user_id_to_tag.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20190618202817_add_user_id_to_tag.rb b/db/migrate/20190618202817_add_user_id_to_tag.rb index 8268aeb5..8a6e0ca9 100644 --- a/db/migrate/20190618202817_add_user_id_to_tag.rb +++ b/db/migrate/20190618202817_add_user_id_to_tag.rb @@ -4,7 +4,7 @@ class AddUserIdToTag < ActiveRecord::Migration[5.2] # Find uses of each tag for both Todos and RecurringTodos to # figure out which users use which tags. - @tags = execute <<-EOQ + @tags = exec_query <<-EOQ SELECT t.id AS tid, tds.user_id AS todo_uid, rt.user_id AS rtodo_uid FROM tags t JOIN taggings tgs ON tgs.tag_id = t.id From 5d28482f3dbc1b25265f6afa8dda78bdd889a64f Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Tue, 5 Nov 2019 20:34:21 -0600 Subject: [PATCH 005/767] Do builds on push and pull request --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index cf1ea945..2980320b 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,7 +1,7 @@ --- name: Continuous Integration -on: push +on: [push, pull_request] jobs: test: From ab6d51081ae91130d72644e1902b4b1cb543b546 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 6 Nov 2019 23:27:13 +0200 Subject: [PATCH 006/767] Version 2.4.1 --- README.md | 2 +- config/initializers/tracks.rb | 2 +- doc/CHANGELOG.md | 7 +++++++ doc/installation.md | 2 +- doc/upgrading.md | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6b1b8095..d4dac5c2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ * IRC channel: #tracks on Freenode * Original developer: bsag (http://www.rousette.org.uk/) * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors -* Version: 2.4.0 +* Version: 2.4.1 [![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions) [![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks) diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb index 60245c3f..488b797f 100644 --- a/config/initializers/tracks.rb +++ b/config/initializers/tracks.rb @@ -1,4 +1,4 @@ -tracks_version='2.4.0' +tracks_version='2.4.1' # comment out next two lines if you do not want (or can not) the date of the # last git commit in the footer info=`git log --pretty=format:"%ai" -1` diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 36326425..7cd9a0c7 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,10 @@ +## Version 2.4.1 + +### Bug fixes +* Fixed a bug in the tag migration that prevented the migration from completing + at least in some MySQL environments. The bug only affected upgrading an existing Tracks + installation. + ## Version 2.4.0 ### New features diff --git a/doc/installation.md b/doc/installation.md index 2f03d75e..fd7af61a 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -10,7 +10,7 @@ For alternative installation options and tips for specific environments, please Tracks has a few software requirements that must be satisfied before installation: -1. **Ruby**. Tracks requires Ruby 1.9.3 or greater. +1. **Ruby**. Tracks requires Ruby 2.4 or greater. 2. **Bundler**. Tracks requires a recent version of [Bundler](http://bundler.io) to handle the installation of dependencies. Bundler is typically installed by running `gem install bundler`. 3. **Database**. Tracks is tested on [MySQL](http://www.mysql.com/) and [SQLite](http://www.sqlite.org/), but [PostgreSQL](http://www.postgresql.org/) can also be used. Of the three, SQLite requires the least configuration. Whatever your choice, the appropriate database software must be installed. diff --git a/doc/upgrading.md b/doc/upgrading.md index 8cc2c716..8632ba3c 100644 --- a/doc/upgrading.md +++ b/doc/upgrading.md @@ -1,6 +1,6 @@ # Upgrading Tracks -## Upgrading from Tracks 2.3 to 2.4.0 +## Upgrading from Tracks 2.3 to 2.4.1 These upgrade instructions are rough. Please suggest improvements in a GitHub issue if you run into problems. From db199b68df193e2f60bb93d5e089633455c93c8f Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 7 Nov 2019 18:06:30 +0200 Subject: [PATCH 007/767] Fix the contributors file location in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4dac5c2..1a3e6d17 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ you cannot find a solution to your problem. The wiki has a lot of user contributed installation HOWTOs for various webhosts, specific OS's and more. If you are thinking about contributing towards the development of Tracks, -please read /doc/README_DEVELOPERS for general information. Also you can find +please read /CONTRIBUTING.md for general information. Also you can find some information on development, testing and contributing on the wiki. While fully usable for everyday use, Tracks is still a work in progress. Make From 7f45f748b300aa7622ccd42933dca15a0bdc36de Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 13 Nov 2019 19:33:11 +0200 Subject: [PATCH 008/767] #2259: Trying without the branch --- Gemfile | 2 +- Gemfile.lock | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index b048489d..f8ff1f4a 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem 'paperclip' # To use ActiveModel has_secure_password gem 'bcrypt', '~> 3.1.13' -gem 'chartjs-ror', :github => 'ZeiP/chartjs-ror', :branch => 'bug/41_container_element' +gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index 0839f04f..b1b0b653 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,6 @@ GIT remote: git://github.com/ZeiP/chartjs-ror.git revision: e9d3aabbda3059c001144833d915a386d8b511c5 - branch: bug/41_container_element specs: chartjs-ror (3.6.4) rails (>= 3.1) From bc7404714cbab06b3b8827979ae22ea67a9b6726 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 13 Nov 2019 21:04:30 +0200 Subject: [PATCH 009/767] #2259: Perhaps just run the CI once --- .github/workflows/continuous-integration.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2980320b..a7387608 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,7 +1,9 @@ --- name: Continuous Integration -on: [push, pull_request] +on: + pull_request: + types: opened, edited jobs: test: From 2d4a3625c36b908fcc2c10b823033e13410bde69 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 13 Nov 2019 21:23:09 +0200 Subject: [PATCH 010/767] #2259: Try without the type limits for CI --- .github/workflows/continuous-integration.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a7387608..c2a51a65 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,9 +1,7 @@ --- name: Continuous Integration -on: - pull_request: - types: opened, edited +on: pull_request jobs: test: From e0aa0ac69e3b81a974c9a7e5afb8e0be088d2661 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 14 Nov 2019 02:16:59 +0200 Subject: [PATCH 011/767] #2072: Remove needless sanitisation of tags. The sanitised version is only used in DB queries, which handle escaping themselves; the actual UI XSS sanitisation is handled separately. --- app/controllers/todos_controller.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index a23419b8..743a5515 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -871,14 +871,16 @@ class TodosController < ApplicationController def get_params_for_tag_view filter_format_for_tag_view - # use sanitize to prevent XSS attacks + # Don't use sanitize here because these are only used for a DB query. @tag_expr = [] - @tag_expr << sanitize(params[:name]).split(',') - @tag_expr << sanitize(params[:and]).split(',') if params[:and] + # Tag conditions handled as OR. + @tag_expr << params[:name].split(',') + # Additional tag condition(s) handled as AND. + @tag_expr << params[:and].split(',') if params[:and] i = 1 while params['and'+i.to_s] - @tag_expr << sanitize(params['and'+i.to_s]).split(',') + @tag_expr << params['and'+i.to_s].split(',') i=i+1 end From c66ce02cb61805829608993fc6f9ab424c320148 Mon Sep 17 00:00:00 2001 From: Jan-Yves Ruzicka Date: Sun, 17 Nov 2019 16:03:40 +1300 Subject: [PATCH 012/767] Refactor todos_controller and todos_helper to use @original_item Project uses properties of @original_item over a number of similar-named variables (eg. @original_item_description, @original_item_was_pending, etc.) Have left in @original_item_due_date and @original_completed_period as these are more complex, and not simply properties of the todo item. --- app/controllers/todos_controller.rb | 79 ++++++++++++----------------- app/helpers/todos_helper.rb | 12 +++-- 2 files changed, 41 insertions(+), 50 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index a23419b8..80358c18 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -301,28 +301,27 @@ class TodosController < ApplicationController end end + ## # Toggles the 'done' status of the action - # def toggle_check @todo = current_user.todos.find(params['id']) @source_view = params['_source_view'] || 'todo' - @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo - @original_item_due = @todo.due - @original_item_was_deferred = @todo.deferred? - @original_item_was_pending = @todo.pending? - @original_item_was_hidden = @todo.hidden? - @original_item_context_id = @todo.context_id - @original_item_project_id = @todo.project_id + # Create a (unsaved) copy of the original todo, before it was toggled + @original_item = current_user.todos.build(@todo.attributes) @original_completed_period = DoneTodos.completed_period(@todo.completed_at) - @todo_was_completed_from_deferred_or_blocked_state = @original_item_was_deferred || @original_item_was_pending + + @todo_was_completed_from_deferred_or_blocked_state = + @original_item.deferred? || @original_item.pending? @saved = @todo.toggle_completion! - @todo_was_blocked_from_completed_state = @todo.pending? # since we toggled_completion the previous state was completed + # As a result of toggling the done status of the todo, have we shifted from + # "Done" to "Blocked"? + @todo_was_blocked_from_completed_state = @todo.pending? - # check if this todo has a related recurring_todo. If so, create next todo + # Check if this todo has a related recurring_todo. If so, create next todo @new_recurring_todo = check_for_next_todo(@todo) if @saved @predecessors = @todo.uncompleted_predecessors @@ -343,7 +342,7 @@ class TodosController < ApplicationController determine_deferred_tag_count(params['_tag_name']) if source_view_is(:tag) @wants_redirect_after_complete = @todo.completed? && !@todo.project_id.nil? && current_user.prefs.show_project_on_todo_done && !source_view_is(:project) if source_view_is :calendar - @original_item_due_id = get_due_id_for_calendar(@original_item_due) + @original_item_due_id = get_due_id_for_calendar(@original_item.due) @old_due_empty = is_old_due_empty(@original_item_due_id) end end @@ -403,7 +402,6 @@ class TodosController < ApplicationController def change_context # change context if you drag a todo to another context @todo = current_user.todos.find(params[:id]) - @original_item_context_id = @todo.context_id @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo @context = current_user.contexts.find(params[:todo][:context_id]) @todo.context = @context @@ -426,8 +424,6 @@ class TodosController < ApplicationController @todo = current_user.todos.find(params['id']) @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo - cache_attributes_from_before_update # TODO: remove in favor of @original_item - update_tags update_project update_context @@ -456,7 +452,7 @@ class TodosController < ApplicationController update_dependency_state if @project_changed - @remaining_undone_in_project = current_user.projects.find(@original_item_project_id).todos.active.count if source_view_is :project + @remaining_undone_in_project = current_user.projects.find(@original_item.project_id).todos.active.count if source_view_is :project end determine_changes_by_this_update @@ -464,7 +460,7 @@ class TodosController < ApplicationController determine_down_count determine_deferred_tag_count(sanitize(params['_tag_name'])) if source_view_is(:tag) - @todo.touch_predecessors if @original_item_description != @todo.description + @todo.touch_predecessors if @original_item.description != @todo.description respond_to do |format| format.js { @@ -496,7 +492,6 @@ class TodosController < ApplicationController @source_view = params['_source_view'] || 'todo' @todo = current_user.todos.find(params['id']) @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo - @original_item_due = @todo.due @context_id = @todo.context_id @project_id = @todo.project_id @todo_was_destroyed = true @@ -545,7 +540,7 @@ class TodosController < ApplicationController if source_view_is_one_of(:todo, :deferred, :project, :context, :tag) determine_remaining_in_container_count(@todo) elsif source_view_is :calendar - @original_item_due_id = get_due_id_for_calendar(@original_item_due) + @original_item_due_id = get_due_id_for_calendar(@original_item.due) @old_due_empty = is_old_due_empty(@original_item_due_id) end end @@ -728,7 +723,6 @@ class TodosController < ApplicationController @todo = current_user.todos.find(params[:id]) @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo - @original_item_context_id = @todo.context_id @todo_deferred_state_changed = true @new_context_created = false @due_date_changed = false @@ -745,7 +739,6 @@ class TodosController < ApplicationController source_view do |page| page.project { @remaining_undone_in_project = current_user.projects.find(@todo.project_id).todos.not_completed.count - @original_item_project_id = @todo.project_id } page.tag { determine_deferred_tag_count(params['_tag_name']) @@ -945,7 +938,7 @@ end @down_count = current_user.todos.active.not_hidden.count end from.context do - context_id = @original_item_context_id || @todo.context_id + context_id = @original_item.context_id || @todo.context_id todos = current_user.contexts.find(context_id).todos.not_completed if @todo.context.hidden? @@ -1019,7 +1012,7 @@ end @remaining_deferred_or_pending_count = current_user.todos.with_tag(tag.id).deferred_or_blocked.count } from.project { - project_id = @project_changed ? @original_item_project_id : @todo.project_id + project_id = @project_changed ? @original_item.project_id : @todo.project_id @remaining_deferred_or_pending_count = current_user.projects.find(project_id).todos.deferred_or_blocked.count if @todo_was_completed_from_deferred_or_blocked_state @@ -1163,19 +1156,6 @@ end end end - def cache_attributes_from_before_update - @original_item_context_id = @todo.context_id - @original_item_project_id = @todo.project_id - @original_item_was_deferred = @todo.deferred? - @original_item_was_hidden = @todo.hidden? - @original_item_was_pending = @todo.pending? - @original_item_due = @todo.due - @original_item_due_id = get_due_id_for_calendar(@todo.due) - @original_item_predecessor_list = @todo.predecessors.map{|t| t.specification}.join(', ') - @original_item_description = @todo.description - @todo_was_deferred_or_blocked = @todo.deferred? || @todo.pending? - end - def update_project @project_changed = false if params['todo']['project_id'].blank? && !params['project_name'].nil? @@ -1193,7 +1173,7 @@ end end end params["todo"]["project_id"] = project.id - @project_changed = @original_item_project_id != params["todo"]["project_id"] = project.id + @project_changed = @original_item.project_id != params["todo"]["project_id"] = project.id end end @@ -1212,7 +1192,7 @@ end @context = @new_context end params["todo"]["context_id"] = @context.id - @context_changed = @original_item_context_id != params["todo"]["context_id"] = @context.id + @context_changed = @original_item.context_id != params["todo"]["context_id"] = @context.id end end @@ -1258,7 +1238,12 @@ end def update_dependency_state # assumes @todo.save was called so that the predecessor_list is persistent - if @original_item_predecessor_list != params[:predecessor_list] + original_item_predecessor_list = + @original_item.predecessors + .map{ |t| t.specification } + .join(', ') + + if original_item_predecessor_list != params[:predecessor_list] # Possible state change with new dependencies if @todo.uncompleted_predecessors.empty? @todo.activate! if @todo.state == 'pending' # Activate pending if no uncompleted predecessors @@ -1276,16 +1261,16 @@ end end def determine_changes_by_this_update - @todo_was_activated_from_deferred_state = @todo.active? && @original_item_was_deferred - @todo_was_activated_from_pending_state = @todo.active? && @original_item_was_pending - @todo_was_deferred_from_active_state = @todo.deferred? && !@original_item_was_deferred - @todo_was_blocked_from_active_state = @todo.pending? && !@original_item_was_pending + @todo_was_activated_from_deferred_state = @todo.active? && @original_item.deferred? + @todo_was_activated_from_pending_state = @todo.active? && @original_item.pending? + @todo_was_deferred_from_active_state = @todo.deferred? && !@original_item.deferred? + @todo_was_blocked_from_active_state = @todo.pending? && !@original_item.pending? - @todo_deferred_state_changed = @original_item_was_deferred != @todo.deferred? - @todo_pending_state_changed = @original_item_was_pending != @todo.pending? - @todo_hidden_state_changed = @original_item_was_hidden != @todo.hidden? + @todo_deferred_state_changed = @original_item.deferred? != @todo.deferred? + @todo_pending_state_changed = @original_item.pending? != @todo.pending? + @todo_hidden_state_changed = @original_item.hidden? != @todo.hidden? - @due_date_changed = @original_item_due != @todo.due + @due_date_changed = @original_item.due != @todo.due source_view do |page| page.calendar do diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 8b04e928..47475a86 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -501,7 +501,13 @@ module TodosHelper @todo_was_deferred_from_active_state || @tag_was_removed || @todo_was_destroyed || - (@todo.completed? && !(@original_item_was_deferred || @original_item_was_hidden || @original_item_was_pending)) + ( + @todo.completed? && !( + @original_item.deferred? || + @original_item.hidden? || + @original_item.pending? + ) + ) ) end @@ -662,9 +668,9 @@ module TodosHelper page.calendar { container_id = "#{@original_item_due_id}_container-empty-d" if @old_due_empty } page.tag { container_id = "hidden_container-empty-d" if (@remaining_hidden_count == 0 && !@todo.hidden? && @todo_hidden_state_changed) || - (@remaining_hidden_count == 0 && @todo.completed? && @original_item_was_hidden) + (@remaining_hidden_count == 0 && @todo.completed? && @original_item.hidden?) container_id = "deferred_pending_container-empty-d" if (todo_was_removed_from_deferred_or_blocked_container && @remaining_deferred_or_pending_count == 0) || - (@original_item_was_deferred && @remaining_deferred_or_pending_count == 0 && (@todo.completed? || @tag_was_removed)) + (@original_item.deferred? && @remaining_deferred_or_pending_count == 0 && (@todo.completed? || @tag_was_removed)) container_id = "completed_container-empty-d" if @completed_count && @completed_count == 0 && !@todo.completed? } page.context { From eb5c2484a9e3f4966dbad7da7096aefff5e363c4 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Tue, 26 Nov 2019 15:27:19 -0600 Subject: [PATCH 013/767] Remove a useless variable assignment We can shortcut the assignment that was in the partial by naming the object directly. --- app/views/shared/_add_new_item_form.html.erb | 4 ++-- app/views/todos/_new_multi_todo_form.html.erb | 2 -- app/views/todos/_new_todo_form.html.erb | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/views/shared/_add_new_item_form.html.erb b/app/views/shared/_add_new_item_form.html.erb index e592540a..42a33364 100644 --- a/app/views/shared/_add_new_item_form.html.erb +++ b/app/views/shared/_add_new_item_form.html.erb @@ -14,7 +14,7 @@ <%= t('shared.toggle_multi') %> - <%= render :partial => 'todos/new_todo_form', :object => Todo.new %> - <%= render :partial => 'todos/new_multi_todo_form', :object => Todo.new %> + <%= render :partial => 'todos/new_todo_form', :locals => {todo: Todo.new} %> + <%= render :partial => 'todos/new_multi_todo_form', :locals => {todo: Todo.new} %> diff --git a/app/views/todos/_new_multi_todo_form.html.erb b/app/views/todos/_new_multi_todo_form.html.erb index 1e30579a..7a5be642 100644 --- a/app/views/todos/_new_multi_todo_form.html.erb +++ b/app/views/todos/_new_multi_todo_form.html.erb @@ -1,5 +1,3 @@ -<%- todo = new_multi_todo_form -%> - diff --git a/config/locales/en.yml b/config/locales/en.yml index a953c51a..663cbea6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -821,11 +821,13 @@ en: authentication_header: Your authentication current_authentication_type: Your authentication type is %{auth_type} change_authentication_type: Change your authentication type + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. tabs: authentication: Authentication tracks_behavior: Tracks behavior profile: Profile date_and_time: Date and time + remove_account: Remove account generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. data: import_successful: Import was successful. diff --git a/config/routes.rb b/config/routes.rb index 79d5d5c6..6650560a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -106,7 +106,7 @@ Rails.application.routes.draw do # This means the controller action needs to parse the extension and set format/content type # Needed for /todos/tag/first.last.m to work get 'todos/tag/:name' => 'todos#tag', :as => :tag, :format => false, :name => /.*/ - + get 'attachments/:id/:filename' => "todos#attachment" get 'tags.autocomplete' => "todos#tags", :format => 'autocomplete' get 'todos/done/tag/:name' => "todos#done_tag", :as => :done_tag diff --git a/lib/login_system.rb b/lib/login_system.rb index ce2e2614..85d1d3e0 100644 --- a/lib/login_system.rb +++ b/lib/login_system.rb @@ -222,6 +222,7 @@ private def redirect_to_login respond_to do |format| format.html { redirect_to login_path } + format.js { render js: "redirect_to('" + login_path + "')" } format.m { redirect_to login_path(:format => 'm') } end end From 2f5e5a5ae3fd8bd7466be8ed9163078fc92ba467 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2020 05:56:58 +0000 Subject: [PATCH 141/767] Bump rubocop from 0.89.0 to 0.89.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.89.0 to 0.89.1. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.89.0...v0.89.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 93fc2af7..9f65353c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,13 +203,13 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.89.0) + rubocop (0.89.1) parallel (~> 1.10) parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.1.0, < 1.0) + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.3.0) From 95cb7ec79971fecb09942b4667e573a3fdef2c68 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 11 Aug 2020 11:50:35 +0300 Subject: [PATCH 142/767] Fix tests and add more comments --- app/controllers/users_controller.rb | 12 +++++++++--- test/test_helper.rb | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a58d5a63..f4c6da9f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -131,16 +131,20 @@ class UsersController < ApplicationController # DELETE /users/id DELETE /users/id.xml def destroy @deleted_user = User.find(params[:id]) + + # Check that the user has access (logged in as admin or the target user.) unless current_user && (current_user.is_admin || current_user == @deleted_user) render :body => t('errors.user_unauthorized'), :status => 401 return end + # Remove the user @saved = @deleted_user.destroy - if current_user == @deleted_user + + # Log out the user if they've deleted their own user and it succeeded. + if @saved && current_user == @deleted_user logout_user end - @total_users = User.count respond_to do |format| format.html do @@ -155,7 +159,9 @@ class UsersController < ApplicationController redirect_to users_url end end - format.js + format.js do + @total_users = User.count + end format.xml do head :ok end diff --git a/test/test_helper.rb b/test/test_helper.rb index 94bdf410..70c26275 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -140,7 +140,7 @@ class ActionDispatch::IntegrationTest end def assert_401_unauthorized_admin - assert_response_and_body 401, "401 Unauthorized: Only admin users are allowed access to this function." + assert_response_and_body 401, "401 Unauthorized: Only administrative users are allowed access to this function." end def assert_responses_with_error(error_msg) From 69b24c3af73ce7d784f23c2fae07fb145cbc377d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Aug 2020 05:37:11 +0000 Subject: [PATCH 143/767] Bump aasm from 4.12.3 to 5.1.1 Bumps [aasm](https://github.com/aasm/aasm) from 4.12.3 to 5.1.1. - [Release notes](https://github.com/aasm/aasm/releases) - [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) - [Commits](https://github.com/aasm/aasm/compare/v4.12.3...v5.1.1) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5a0c005a..4152ea0e 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem "RedCloth" gem "sanitize", "~> 5.2" gem "will_paginate" gem "acts_as_list" -gem "aasm", '~> 4.12.3' +gem "aasm", '~> 5.1.1' gem "htmlentities" gem "rails_autolink" gem 'puma', '~> 4.3' diff --git a/Gemfile.lock b/Gemfile.lock index 9f65353c..080dca69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.2) - aasm (4.12.3) + aasm (5.1.1) concurrent-ruby (~> 1.0) actioncable (5.2.4.3) actionpack (= 5.2.4.3) @@ -87,7 +87,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) crass (1.0.6) database_cleaner (1.8.5) diff-lcs (1.3) @@ -294,7 +294,7 @@ PLATFORMS DEPENDENCIES RedCloth - aasm (~> 4.12.3) + aasm (~> 5.1.1) actionpack-xml_parser (~> 2.0) activemodel-serializers-xml (~> 1.0.1) acts_as_list From b4f8b65f49ac38520675ed27b8f382fc366104ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2020 05:49:16 +0000 Subject: [PATCH 144/767] Bump solargraph from 0.39.13 to 0.39.14 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.39.13 to 0.39.14. - [Release notes](https://github.com/castwide/solargraph/releases) - [Commits](https://github.com/castwide/solargraph/compare/v0.39.13...v0.39.14) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9f65353c..439d7ecf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -242,7 +242,7 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) - solargraph (0.39.13) + solargraph (0.39.14) backport (~> 1.1) benchmark bundler (>= 1.17.2) From 4bfffc6476db1fc6a3d37a7af997004cb99550da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 05:49:51 +0000 Subject: [PATCH 145/767] Bump simplecov from 0.18.5 to 0.19.0 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.18.5 to 0.19.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.18.5...v0.19.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 439d7ecf..1f36a807 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,7 +238,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - simplecov (0.18.5) + simplecov (0.19.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) From d03edb72694c7778facdb7b2180d46d8e772c768 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 17 Aug 2020 12:23:11 +0300 Subject: [PATCH 146/767] Dropping Ruby 2.4 because dependencies dropped it. --- doc/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.md b/doc/installation.md index f47db6a7..d138c70b 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -98,7 +98,7 @@ This description is intended for people installing Tracks from scratch. If you w Tracks has a few software requirements that must be satisfied before installation: -1. **Ruby**. Tracks requires Ruby 2.4 or greater, but is not tested with 2.7. +1. **Ruby**. Tracks requires Ruby 2.5 or greater. Most of the testing is done with 2.6. 2. **Bundler**. Tracks requires a recent version of [Bundler](http://bundler.io) to handle the installation of dependencies. Bundler is typically installed by running `gem install bundler`. 3. **Database**. Tracks is tested on [MySQL](http://www.mysql.com/) and [SQLite](http://www.sqlite.org/), but [PostgreSQL](http://www.postgresql.org/) can also be used. Of the three, SQLite requires the least configuration but is also the least performant and may make it difficult to operate in the future. We recommend either MySQL or PostgreSQL. Whatever your choice, the appropriate database software must be installed. From 2d4ba48ad4edf34d2d9c85699757f14ddf1aee7d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 18 Aug 2020 11:51:16 +0300 Subject: [PATCH 147/767] Move the access control to a dedicated helper --- app/controllers/application_controller.rb | 7 +++++++ app/controllers/users_controller.rb | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bbe55e3a..f589762a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -154,6 +154,13 @@ class ApplicationController < ActionController::Base end end + def admin_or_self_login_required + unless User.find(session['user_id']).is_admin || session['user_id'] == params[:id] + render :body => t('errors.user_unauthorized'), :status => 401 + return false + end + end + def redirect_back_or_home respond_to do |format| format.html { redirect_back_or_default root_url } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f4c6da9f..01d13fc1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,7 @@ class UsersController < ApplicationController before_action :admin_login_required, :only => [ :index, :show ] + before_action :admin_or_self_login_required, :only => [ :destroy ] skip_before_action :login_required, :only => [ :new, :create ] prepend_before_action :login_optional, :only => [ :new, :create ] @@ -132,12 +133,6 @@ class UsersController < ApplicationController def destroy @deleted_user = User.find(params[:id]) - # Check that the user has access (logged in as admin or the target user.) - unless current_user && (current_user.is_admin || current_user == @deleted_user) - render :body => t('errors.user_unauthorized'), :status => 401 - return - end - # Remove the user @saved = @deleted_user.destroy From 6c8e0ce176c03c70a53e7bea1f115d728dc37850 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 18 Aug 2020 14:49:37 +0300 Subject: [PATCH 148/767] Add tests --- test/controllers/users_controller_test.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index c3dde992..13ee8db6 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -36,7 +36,7 @@ class UsersControllerTest < ActionController::TestCase assert_equal assigns['users'],[User.where(:login => 'jane').first] end - def test_destroy_user + def test_destroy_user_as_admin login_as :admin_user @no_users_before = User.count user_id = users(:ldap_user).id @@ -44,8 +44,16 @@ class UsersControllerTest < ActionController::TestCase assert_equal @no_users_before-1, User.count end + def test_destroy_user_as_user + login_as :other_user + @no_users_before = User.count + user_id = users(:other_user).id + post :destroy, xhr: true, params: { :id => user_id.to_param } + assert_equal @no_users_before-1, User.count + end + def test_update_password_successful - get :change_password, params: { :id => users(:admin_user).id } + get :change_password, params: { :id => users(:admin_user).id } # should fail because no login assert_redirected_to login_path login_as :admin_user From 320da8b72a818dde02db63121625d3107c49cb04 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 18 Aug 2020 15:27:43 +0300 Subject: [PATCH 149/767] Compare int to int --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f589762a..184b7fb5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -155,7 +155,7 @@ class ApplicationController < ActionController::Base end def admin_or_self_login_required - unless User.find(session['user_id']).is_admin || session['user_id'] == params[:id] + unless User.find(session['user_id']).is_admin || session['user_id'] == params[:id].to_i render :body => t('errors.user_unauthorized'), :status => 401 return false end From 112419e7130f14f0143449c1cdbd05c8d551ff41 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 18 Aug 2020 17:00:28 +0300 Subject: [PATCH 150/767] Fix the included files for the new version of jquery-ui-rails. Don't know why the menu stylesheet wasn't previously needed as a separate include, but seems to work with the file added. --- app/assets/javascripts/application.js | 12 ++++++------ app/assets/stylesheets/application.scss | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 375f0bdd..113fc78d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,12 +14,12 @@ //= require jquery_ujs //= require bootstrap-sprockets -//= require jquery-ui/autocomplete -//= require jquery-ui/datepicker -//= require jquery-ui/dialog -//= require jquery-ui/droppable -//= require jquery-ui/effect-highlight -//= require jquery-ui/sortable +//= require jquery-ui/widgets/autocomplete +//= require jquery-ui/widgets/datepicker +//= require jquery-ui/widgets/dialog +//= require jquery-ui/widgets/droppable +//= require jquery-ui/effects/effect-highlight +//= require jquery-ui/widgets/sortable // Stuff in app/assets //= require tracks diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 32baec8f..ce2e368d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -10,6 +10,7 @@ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new * file per style scope. * + *= require jquery-ui/menu *= require jquery-ui/autocomplete *= require jquery-ui/datepicker *= require jquery-ui/dialog From 8c2c1654803784bd1c642b5054ff136ef8ddbc8c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 18 Aug 2020 14:10:35 +0000 Subject: [PATCH 151/767] Bump font-awesome-sass from 4.5.0 to 5.13.0 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 4.5.0 to 5.13.0. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5a0c005a..840bf529 100644 --- a/Gemfile +++ b/Gemfile @@ -47,7 +47,7 @@ gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' # gem 'jbuilder', '~> 1.2' gem "bootstrap-sass", "3.4.1" -gem "font-awesome-sass", "~> 4.5.0" +gem "font-awesome-sass", "~> 5.13.0" group :development do gem "spring" diff --git a/Gemfile.lock b/Gemfile.lock index 1f36a807..7132255e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,8 +101,8 @@ GEM factory_bot (~> 6.1.0) railties (>= 5.0.0) ffi (1.9.25) - font-awesome-sass (4.5.0) - sass (>= 3.2) + font-awesome-sass (5.13.0) + sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) @@ -307,7 +307,7 @@ DEPENDENCIES coffee-rails (~> 5.0.0) database_cleaner factory_bot_rails - font-awesome-sass (~> 4.5.0) + font-awesome-sass (~> 5.13.0) htmlentities jquery-rails (~> 4.4) jquery-ui-rails (~> 5.0.5) From 399e2c0b76403e594db63b07f5816c7986e51122 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 19 Aug 2020 02:42:36 +0300 Subject: [PATCH 152/767] Try potential fix for aasm 5.x --- app/models/recurring_todo.rb | 4 ++-- app/models/todo.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb index e9f09ff3..d3daf9ac 100644 --- a/app/models/recurring_todo.rb +++ b/app/models/recurring_todo.rb @@ -12,8 +12,8 @@ class RecurringTodo < ApplicationRecord include AASM aasm :column => :state do - state :active, :initial => true, :before_enter => Proc.new { |t| t.occurrences_count = 0 } - state :completed, :before_enter => Proc.new { |t| t.completed_at = Time.zone.now }, :before_exit => Proc.new { |t| t.completed_at = nil } + state :active, :initial => true, :before_enter => Proc.new { occurrences_count = 0 } + state :completed, :before_enter => Proc.new { completed_at = Time.zone.now }, :before_exit => Proc.new { completed_at = nil } event :complete do transitions :to => :completed, :from => [:active] diff --git a/app/models/todo.rb b/app/models/todo.rb index c69bb69c..ba067946 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -70,13 +70,13 @@ class Todo < ApplicationRecord # state machine include AASM - aasm_initial_state = Proc.new { |t| (t.show_from && t.user && (t.show_from > t.user.date)) ? :deferred : :active} + aasm_initial_state = Proc.new { (show_from && user && (show_from > user.date)) ? :deferred : :active} aasm :column => :state do state :active - state :completed, :before_enter => Proc.new { |t| t.completed_at = Time.zone.now }, :before_exit => Proc.new { |t| t.completed_at = nil} - state :deferred, :before_exit => Proc.new { |t| t[:show_from] = nil } + state :completed, :before_enter => Proc.new { completed_at = Time.zone.now }, :before_exit => Proc.new { completed_at = nil} + state :deferred, :before_exit => Proc.new { show_from = nil } state :pending event :defer do From 99e2d0bb107455103f4187e60c0abfdf42c72df2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2020 05:51:06 +0000 Subject: [PATCH 153/767] Bump solargraph from 0.39.14 to 0.39.15 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.39.14 to 0.39.15. - [Release notes](https://github.com/castwide/solargraph/releases) - [Commits](https://github.com/castwide/solargraph/compare/v0.39.14...v0.39.15) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28517123..62c94f4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -242,7 +242,7 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) - solargraph (0.39.14) + solargraph (0.39.15) backport (~> 1.1) benchmark bundler (>= 1.17.2) From ea6c11c3a41c6df7df35b570a3dd1132c11bde3d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 19 Aug 2020 11:54:50 +0300 Subject: [PATCH 154/767] Add the style parameter --- app/helpers/icon_helper.rb | 4 ++-- app/views/shared/_navbar.html.erb | 10 +++++----- test/helpers/icon_helper_test.rb | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/helpers/icon_helper.rb b/app/helpers/icon_helper.rb index 3fb817fa..108a9e9b 100644 --- a/app/helpers/icon_helper.rb +++ b/app/helpers/icon_helper.rb @@ -1,7 +1,7 @@ module IconHelper include FontAwesome::Sass::Rails::ViewHelpers - def icon_fw(icon, text = nil, html_options = {}) + def icon_fw(style, name, text = nil, html_options = {}) text, html_options = nil, text if text.is_a?(Hash) if html_options.key?(:class) @@ -10,6 +10,6 @@ module IconHelper html_options[:class] = "fa-fw" end - icon(icon, text, html_options) + icon(style, name, text, html_options) end end diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 709670c5..dd664fe8 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -67,16 +67,16 @@ <%= content_tag :span, t('layouts.navigation.options'), class: 'visible-xs-inline' %>
    -
  • <%= link_to icon_fw('sign-out', t('common.logout')), logout_path %>
    • +
  • <%= link_to icon_fw('fas', 'sign-out', t('common.logout')), logout_path %>
  • <%= current_user.display_name %>
    • -
  • <%= link_to icon_fw('wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %>
    • -
  • <%= link_to icon_fw('download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %>
    • -
  • <%= link_to icon_fw('upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %>
    • +
  • <%= link_to icon_fw('fas', 'wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %>
    • +
  • <%= link_to icon_fw('fas', 'download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %>
    • +
  • <%= link_to icon_fw('fas', 'upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %>
    • <% if current_user.is_admin? %>
  • <%= t('layouts.navigation.admin') %>
    • -
  • <%= link_to icon_fw('users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %>
    • +
  • <%= link_to icon_fw('fas', 'users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %>
    • <% end %>
diff --git a/test/helpers/icon_helper_test.rb b/test/helpers/icon_helper_test.rb index 5ab2e43f..90eaf3f4 100644 --- a/test/helpers/icon_helper_test.rb +++ b/test/helpers/icon_helper_test.rb @@ -4,10 +4,10 @@ class IconHelperTest < ActionView::TestCase include IconHelper test 'icon_fw generates fixed-width class' do - assert_equal '', icon_fw('gear') + assert_equal '', icon_fw('fas', 'gear') end test 'icon_fw accepts an additional class' do - assert_equal '', icon_fw('gear', class: 'myclass') + assert_equal '', icon_fw('fas', 'gear', class: 'myclass') end end From 7bad259d2c2630616127f9274982d1abb2b9147e Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 19 Aug 2020 12:25:59 +0300 Subject: [PATCH 155/767] Fixed a few more uses of the library icon helper --- app/views/search/_index.html.erb | 2 +- app/views/shared/_navbar.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/search/_index.html.erb b/app/views/search/_index.html.erb index b77fae66..ced351fc 100644 --- a/app/views/search/_index.html.erb +++ b/app/views/search/_index.html.erb @@ -4,7 +4,7 @@ <%= text_field_tag(:search, params[:search], class: 'form-control') %>
<%= button_tag(type: 'submit', class: 'btn pull-right') do%> - <%= icon('search', class: 'hidden-xs') %> + <%= icon('fas', 'search', class: 'hidden-xs') %> <% end %>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index dd664fe8..f0f5fdf9 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -63,7 +63,7 @@
    • From 6383c3d9981dff68b91118a91fca2d8c707ab695 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 19 Aug 2020 13:14:07 +0300 Subject: [PATCH 156/767] Replace sass-rails with sassc-rails. --- Gemfile | 2 +- Gemfile.lock | 19 +++++++------------ app/controllers/application_controller.rb | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index f9f14189..372556d7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rails', '~> 5.2.4' -gem 'sass-rails', '~> 5.0' +gem 'sassc-rails', '~> 2.0.0' gem 'coffee-rails', '~> 5.0.0' #gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index da5585ed..a5268019 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,20 +221,15 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) sassc (2.0.0) ffi (~> 1.9.6) rake + sassc-rails (2.0.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -325,7 +320,7 @@ DEPENDENCIES rspec-expectations rubocop (~> 0.89) sanitize (~> 5.2) - sass-rails (~> 5.0) + sassc-rails (~> 2.0.0) selenium-webdriver (~> 3.142) simplecov solargraph diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 184b7fb5..9a010552 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base append_before_action :set_group_view_by prepend_before_action :login_required prepend_before_action :enable_mobile_content_negotiation - + def set_locale locale = params[:locale] # specifying a locale in the request takes precedence locale = locale || prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over From 2e9a0d2b4cab4b7e8838df6df66e0be0dcf23845 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 25 Jul 2020 14:22:45 +0300 Subject: [PATCH 157/767] New colors to replace the heavy black. --- app/assets/stylesheets/application.scss | 2 ++ app/assets/stylesheets/colors.scss | 6 ++++++ app/assets/stylesheets/legacy.scss | 14 +++++--------- app/assets/stylesheets/login.scss | 2 +- app/assets/stylesheets/tracks.scss | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 app/assets/stylesheets/colors.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ce2e368d..b6981688 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -28,6 +28,8 @@ } .bootstrap { + @import "colors"; + @import "bootstrap-sprockets"; @import "bootstrap"; @import "tracks-logo"; diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/colors.scss new file mode 100644 index 00000000..cb24b296 --- /dev/null +++ b/app/assets/stylesheets/colors.scss @@ -0,0 +1,6 @@ +$gray-lighter: lighten(#000, 93.5%); +$brand-primary: #3C6997; +$navbar-inverse-bg: $brand_primary; +$navbar-inverse-color: $gray-lighter; +$navbar-inverse-link-color: $gray-lighter; + diff --git a/app/assets/stylesheets/legacy.scss b/app/assets/stylesheets/legacy.scss index 9b043021..0063c260 100644 --- a/app/assets/stylesheets/legacy.scss +++ b/app/assets/stylesheets/legacy.scss @@ -75,17 +75,11 @@ p { } a, a:link, a:active, a:visited { - color: #cc3334; text-decoration: none; padding-left: 1px; padding-right: 1px; } -a:hover { - color: #fff; - background-color: #cc3334; -} - h1 { font-size: 304%; font-weight: bold; @@ -820,12 +814,14 @@ form { } #todo_new_action_container, #project_new_project_container, #context_new_container, #recurring_new_container { - background: #ddd; width: 270px; padding: 5px 10px; - background-color: #000; - color: #eee; + background-color: #3C6997; + color: lighten(#000, 93.5%); border-radius: 5px; + a { + color: lighten(#000, 85%); + } } #recurring_new_container img { diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index ee2fa703..49d5d00e 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -21,7 +21,7 @@ body { @include make-sm-column(6); @include make-sm-column-offset(3); margin: 2em auto 1em; - background-color: rgba(0, 0, 0, 0.75); + background-color: $brand-primary; padding: 0 0 1em 0; box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5), 0 2px 3px rgba(0, 0, 0, 0.3); color: #eaeaea; diff --git a/app/assets/stylesheets/tracks.scss b/app/assets/stylesheets/tracks.scss index 2cb3e440..efafa78d 100644 --- a/app/assets/stylesheets/tracks.scss +++ b/app/assets/stylesheets/tracks.scss @@ -1,5 +1,5 @@ .navbar { - /* Shows the number of undone next action */ + /* Shows the count of undone next actions */ .badge { color: #fff; background: #f00; From 9982217ee9434d532b4c1d60604a668f6406ed23 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 20 Aug 2020 02:37:55 +0300 Subject: [PATCH 158/767] Add theme selector to preferences and return the previous black theme as an alternative --- app/assets/stylesheets/black.scss | 12 ++++++++++++ app/assets/stylesheets/legacy.scss | 12 +++++++++--- .../stylesheets/{colors.scss => light_blue.scss} | 6 ++++++ .../stylesheets/{application.scss => manifest.scss} | 2 -- app/controllers/application_controller.rb | 2 ++ app/controllers/login_controller.rb | 2 ++ app/controllers/preferences_controller.rb | 2 +- app/helpers/application_helper.rb | 1 - app/models/preference.rb | 4 ++++ app/views/layouts/application.html.erb | 2 +- app/views/layouts/login.html.erb | 2 +- app/views/preferences/_tracks_behavior.html.erb | 4 +++- config/initializers/assets.rb | 5 +---- config/locales/en.yml | 3 +++ config/site.yml.tmpl | 10 +++------- db/migrate/20200820000743_add_theme_to_preference.rb | 5 +++++ db/schema.rb | 3 ++- lib/common.rb | 9 +++++++++ 18 files changed, 64 insertions(+), 22 deletions(-) create mode 100644 app/assets/stylesheets/black.scss rename app/assets/stylesheets/{colors.scss => light_blue.scss} (54%) rename app/assets/stylesheets/{application.scss => manifest.scss} (98%) create mode 100644 db/migrate/20200820000743_add_theme_to_preference.rb create mode 100644 lib/common.rb diff --git a/app/assets/stylesheets/black.scss b/app/assets/stylesheets/black.scss new file mode 100644 index 00000000..edff8b5c --- /dev/null +++ b/app/assets/stylesheets/black.scss @@ -0,0 +1,12 @@ +$gray-lighter: #EEE; +$brand-primary: rgba(0, 0, 0, 0.75); +$navbar-inverse-bg: $brand_primary; +$navbar-inverse-color: $gray-lighter; +$navbar-inverse-link-color: $gray-lighter; +$link-color: #CC3334; +$link-hover-color: #FFF; +$link-bgcolor: $link-color; +$box-tablink-color: unset; + +// Import all components +@import 'manifest'; diff --git a/app/assets/stylesheets/legacy.scss b/app/assets/stylesheets/legacy.scss index 0063c260..c3a8bf9c 100644 --- a/app/assets/stylesheets/legacy.scss +++ b/app/assets/stylesheets/legacy.scss @@ -75,11 +75,17 @@ p { } a, a:link, a:active, a:visited { + color: $link-color; text-decoration: none; padding-left: 1px; padding-right: 1px; } +a:hover { + color: $link-hover-color; + background-color: $link-bgcolor; +} + h1 { font-size: 304%; font-weight: bold; @@ -816,11 +822,11 @@ form { #todo_new_action_container, #project_new_project_container, #context_new_container, #recurring_new_container { width: 270px; padding: 5px 10px; - background-color: #3C6997; - color: lighten(#000, 93.5%); + background-color: $brand-primary; + color: $gray-lighter; border-radius: 5px; a { - color: lighten(#000, 85%); + color: $box-tablink-color; } } diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/light_blue.scss similarity index 54% rename from app/assets/stylesheets/colors.scss rename to app/assets/stylesheets/light_blue.scss index cb24b296..ae2972c1 100644 --- a/app/assets/stylesheets/colors.scss +++ b/app/assets/stylesheets/light_blue.scss @@ -3,4 +3,10 @@ $brand-primary: #3C6997; $navbar-inverse-bg: $brand_primary; $navbar-inverse-color: $gray-lighter; $navbar-inverse-link-color: $gray-lighter; +$link-color: unset; +$link-hover-color: unset; +$link-bgcolor: unset; +$box-tablink-color: lighten(#000, 85%); +// Import all components +@import 'manifest'; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/manifest.scss similarity index 98% rename from app/assets/stylesheets/application.scss rename to app/assets/stylesheets/manifest.scss index b6981688..ce2e368d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/manifest.scss @@ -28,8 +28,6 @@ } .bootstrap { - @import "colors"; - @import "bootstrap-sprockets"; @import "bootstrap"; @import "tracks-logo"; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9a010552..1f2d62ad 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception include LoginSystem + include Common helper_method :current_user, :prefs, :format_date layout proc{ |controller| controller.mobile? ? "mobile" : "application" } @@ -16,6 +17,7 @@ class ApplicationController < ActionController::Base before_action :set_time_zone before_action :set_zindex_counter before_action :set_locale + before_action :set_theme append_before_action :set_group_view_by prepend_before_action :login_required prepend_before_action :enable_mobile_content_negotiation diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index 2ca0b1cb..e0a97b8d 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -1,10 +1,12 @@ class LoginController < ApplicationController + include Common layout 'login' skip_before_action :set_session_expiration skip_before_action :login_required before_action :login_optional before_action :get_current_user + before_action :set_theme protect_from_forgery :except => [:check_expiry, :login] diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb index 3becc7d0..9e6db06d 100644 --- a/app/controllers/preferences_controller.rb +++ b/app/controllers/preferences_controller.rb @@ -40,7 +40,7 @@ private :staleness_starts, :due_style, :locale, :title_date_format, :time_zone, :show_hidden_projects_in_sidebar, :show_project_on_todo_done, :review_period, :refresh, :verbose_action_descriptors, - :mobile_todos_per_page, :sms_email, :sms_context_id) + :mobile_todos_per_page, :sms_email, :sms_context_id, :theme) end def user_params diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 16ff38f0..bdbb831f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,4 @@ module ApplicationHelper - def group_view_by_menu_entry # not set, no menu entry return "" if @group_view_by.nil? diff --git a/app/models/preference.rb b/app/models/preference.rb index df5e7d18..2666a13a 100644 --- a/app/models/preference.rb +++ b/app/models/preference.rb @@ -2,6 +2,10 @@ class Preference < ApplicationRecord belongs_to :user belongs_to :sms_context, :class_name => 'Context' + def self.themes + { :black => 'black', :light_blue => 'light_blue'} + end + def self.due_styles { :due_in_n_days => 0, :due_on => 1} end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2c2e2b96..31e5808e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,7 +2,7 @@ - <%= stylesheet_link_tag "application", :media => "all" %> + <%= stylesheet_link_tag @user_theme, :media => "all" %> <%= stylesheet_link_tag "print", :media => "print" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 3e726051..ae1e43e7 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -6,7 +6,7 @@ <%= favicon_link_tag 'favicon.ico' %> <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> <%= @page_title -%> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag @user_theme %> <%= yield %> diff --git a/app/views/preferences/_tracks_behavior.html.erb b/app/views/preferences/_tracks_behavior.html.erb index a4efd17d..da5e5473 100644 --- a/app/views/preferences/_tracks_behavior.html.erb +++ b/app/views/preferences/_tracks_behavior.html.erb @@ -1,4 +1,3 @@ -
      <%= pref_with_select_field('prefs', "due_style", [[t('models.preference.due_styles')[0],Preference.due_styles[:due_in_n_days]],[t('models.preference.due_styles')[1],Preference.due_styles[:due_on]]]) %>
      @@ -38,3 +37,6 @@
      <%= pref('prefs', "sms_context") { select('prefs', 'sms_context_id', current_user.contexts.map{|c| [c.name, c.id]}, {}, class: "form-control") } %>
      +
      + <%= pref_with_select_field('prefs', 'theme', [[t('models.preference.themes.black'), Preference.themes[:black]], [t('models.preference.themes.light_blue'), Preference.themes[:light_blue]]]) %> +
      diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index fdadc96a..117d2895 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -11,7 +11,4 @@ Rails.application.config.assets.paths << Rails.root.join('node_modules') # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. -Rails.application.config.assets.precompile += %w( print.css mobile.css jquery-ui/datepicker-*.js swf_fu.js ) - -# add /app/assets/swfs to asset pipeline for charts -Rails.application.config.assets.paths << Rails.root.join("app", "assets", "swfs") +Rails.application.config.assets.precompile += %w( light_blue.css black.css print.css mobile.css jquery-ui/datepicker-*.js ) diff --git a/config/locales/en.yml b/config/locales/en.yml index 663cbea6..7555540c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -132,6 +132,9 @@ en: due_styles: - Due in ___ days - Due on _______ + themes: + black: Black + light_blue: Light blue datetime: prompts: minute: Minute diff --git a/config/site.yml.tmpl b/config/site.yml.tmpl index 1d837be0..bd000214 100644 --- a/config/site.yml.tmpl +++ b/config/site.yml.tmpl @@ -2,17 +2,14 @@ authentication_schemes: - "database" - # You'll probably want to change this to the time zone of the computer where # Tracks is running. Run rake time:zones:local have Rails suggest time zone # names on your system time_zone: "UTC" - # setting this to true will make the cookies only available over HTTPS secure_cookies: false - # Your secret key for verifying the integrity of signed cookies. # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, @@ -32,22 +29,22 @@ force_ssl: false # address rather than the From: address. # email_dispatch: 'to' - # If you want to send all email to a specific user, uncomment the following line # and set the environment variable TRACKS_MAIL_RECEIVER to the login name of the # user that will receive all email # email_dispatch: 'single_user' - # Set this to the subdirectory you're hosting tracks in and uncomment if # applicable. NOTE: you will also need to set up your web server to deal with # the relative URL. Mongrel, for example, has a --prefix option. # subdir: "/tracks" - # Set to true to allow anyone to sign up for a username. open_signups: false +# Default theme and theme for the login form. +# default_theme: light_blue + # Set to require TOS approval on signup. #tos_link: "https://www.example.com" @@ -64,7 +61,6 @@ open_signups: false # on the signup page admin_email: my.email@domain.com - # Map of allowed incoming email addresses to real users # Requires email_dispatch == 'to' # This allows you to specify _who_ can send email Todos to your list diff --git a/db/migrate/20200820000743_add_theme_to_preference.rb b/db/migrate/20200820000743_add_theme_to_preference.rb new file mode 100644 index 00000000..0eed0a21 --- /dev/null +++ b/db/migrate/20200820000743_add_theme_to_preference.rb @@ -0,0 +1,5 @@ +class AddThemeToPreference < ActiveRecord::Migration[5.2] + def change + add_column :preferences, :theme, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index b0f92d33..a0b9a251 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_08_10_123316) do +ActiveRecord::Schema.define(version: 2020_08_20_000743) do create_table "attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.integer "todo_id" @@ -87,6 +87,7 @@ ActiveRecord::Schema.define(version: 2020_08_10_123316) do t.integer "sms_context_id" t.string "locale" t.integer "review_period", default: 14, null: false + t.string "theme" t.index ["user_id"], name: "index_preferences_on_user_id" end diff --git a/lib/common.rb b/lib/common.rb new file mode 100644 index 00000000..240fa8f0 --- /dev/null +++ b/lib/common.rb @@ -0,0 +1,9 @@ +module Common + def set_theme + if prefs && prefs.theme + @user_theme = prefs.theme.parameterize.underscore + else + @user_theme = SITE_CONFIG['default_theme'] || 'light_blue' + end + end +end From a504e0a0c17e0ca2e0296587f6c6168154e3b9a3 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 20 Aug 2020 03:32:33 +0300 Subject: [PATCH 159/767] Fix signout icon; the original is only available in FA 5 Pro --- app/views/shared/_navbar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index f0f5fdf9..0ccc6fc9 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -67,7 +67,7 @@ <%= content_tag :span, t('layouts.navigation.options'), class: 'visible-xs-inline' %>
        -
      • <%= link_to icon_fw('fas', 'sign-out', t('common.logout')), logout_path %>
        • +
      • <%= link_to icon_fw('fas', 'sign-out-alt', t('common.logout')), logout_path %>
      • <%= current_user.display_name %>
      • <%= link_to icon_fw('fas', 'wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %>
        • From c39a97cbf82f5521d461ac814bf18d6f76800979 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 06:13:52 +0000 Subject: [PATCH 160/767] Bump sassc-rails from 2.0.0 to 2.1.2 Bumps [sassc-rails](https://github.com/sass/sassc-rails) from 2.0.0 to 2.1.2. - [Release notes](https://github.com/sass/sassc-rails/releases) - [Commits](https://github.com/sass/sassc-rails/compare/v2.0.0...v2.1.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 372556d7..221e9fb4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rails', '~> 5.2.4' -gem 'sassc-rails', '~> 2.0.0' +gem 'sassc-rails', '~> 2.1.2' gem 'coffee-rails', '~> 5.0.0' #gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index a5268019..0126714c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) crass (1.0.6) database_cleaner (1.8.5) diff-lcs (1.3) @@ -100,13 +100,13 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - ffi (1.9.25) + ffi (1.13.1) font-awesome-sass (5.13.0) sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) - i18n (1.8.4) + i18n (1.8.5) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) jquery-rails (4.4.0) @@ -221,10 +221,9 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - sassc (2.0.0) - ffi (~> 1.9.6) - rake - sassc-rails (2.0.0) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) @@ -252,7 +251,7 @@ GEM tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) spring (2.1.0) - sprockets (3.7.2) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -320,7 +319,7 @@ DEPENDENCIES rspec-expectations rubocop (~> 0.89) sanitize (~> 5.2) - sassc-rails (~> 2.0.0) + sassc-rails (~> 2.1.2) selenium-webdriver (~> 3.142) simplecov solargraph From 31af1a7f3d1dd0e1a41af885eda06663f25251bf Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 20 Aug 2020 12:16:33 +0300 Subject: [PATCH 161/767] Move asset precompile config to config/manifest.js for Sprockets 4. --- app/assets/config/manifest.js | 3 +++ app/assets/stylesheets/black.scss | 2 +- app/assets/stylesheets/{ => include}/icons.scss | 0 app/assets/stylesheets/{ => include}/legacy.scss | 0 app/assets/stylesheets/{ => include}/login.scss | 0 app/assets/stylesheets/{ => include}/manifest.scss | 0 app/assets/stylesheets/{ => include}/tracks-logo.scss | 0 app/assets/stylesheets/{ => include}/tracks.scss | 0 app/assets/stylesheets/light_blue.scss | 2 +- config/initializers/assets.rb | 5 ----- 10 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 app/assets/config/manifest.js rename app/assets/stylesheets/{ => include}/icons.scss (100%) rename app/assets/stylesheets/{ => include}/legacy.scss (100%) rename app/assets/stylesheets/{ => include}/login.scss (100%) rename app/assets/stylesheets/{ => include}/manifest.scss (100%) rename app/assets/stylesheets/{ => include}/tracks-logo.scss (100%) rename app/assets/stylesheets/{ => include}/tracks.scss (100%) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 00000000..b16e53d6 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/stylesheets/black.scss b/app/assets/stylesheets/black.scss index edff8b5c..86647a0b 100644 --- a/app/assets/stylesheets/black.scss +++ b/app/assets/stylesheets/black.scss @@ -9,4 +9,4 @@ $link-bgcolor: $link-color; $box-tablink-color: unset; // Import all components -@import 'manifest'; +@import 'include/manifest'; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/include/icons.scss similarity index 100% rename from app/assets/stylesheets/icons.scss rename to app/assets/stylesheets/include/icons.scss diff --git a/app/assets/stylesheets/legacy.scss b/app/assets/stylesheets/include/legacy.scss similarity index 100% rename from app/assets/stylesheets/legacy.scss rename to app/assets/stylesheets/include/legacy.scss diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/include/login.scss similarity index 100% rename from app/assets/stylesheets/login.scss rename to app/assets/stylesheets/include/login.scss diff --git a/app/assets/stylesheets/manifest.scss b/app/assets/stylesheets/include/manifest.scss similarity index 100% rename from app/assets/stylesheets/manifest.scss rename to app/assets/stylesheets/include/manifest.scss diff --git a/app/assets/stylesheets/tracks-logo.scss b/app/assets/stylesheets/include/tracks-logo.scss similarity index 100% rename from app/assets/stylesheets/tracks-logo.scss rename to app/assets/stylesheets/include/tracks-logo.scss diff --git a/app/assets/stylesheets/tracks.scss b/app/assets/stylesheets/include/tracks.scss similarity index 100% rename from app/assets/stylesheets/tracks.scss rename to app/assets/stylesheets/include/tracks.scss diff --git a/app/assets/stylesheets/light_blue.scss b/app/assets/stylesheets/light_blue.scss index ae2972c1..9d6ea71e 100644 --- a/app/assets/stylesheets/light_blue.scss +++ b/app/assets/stylesheets/light_blue.scss @@ -9,4 +9,4 @@ $link-bgcolor: unset; $box-tablink-color: lighten(#000, 85%); // Import all components -@import 'manifest'; +@import 'include/manifest'; diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 117d2895..719bc58e 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -7,8 +7,3 @@ Rails.application.config.assets.version = '1.0' # Rails.application.config.assets.paths << Emoji.images_path # Add Yarn node_modules folder to the asset load path. Rails.application.config.assets.paths << Rails.root.join('node_modules') - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -# folder are already added. -Rails.application.config.assets.precompile += %w( light_blue.css black.css print.css mobile.css jquery-ui/datepicker-*.js ) From 2eb4025486f60e728dce73305fbc7e8fc5c7461e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 09:27:26 +0000 Subject: [PATCH 162/767] Bump rails from 5.2.4.3 to 6.0.3.2 Bumps [rails](https://github.com/rails/rails) from 5.2.4.3 to 6.0.3.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4.3...v6.0.3.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 100 +++++++++++++++++++++++++++++---------------------- 2 files changed, 59 insertions(+), 43 deletions(-) diff --git a/Gemfile b/Gemfile index 221e9fb4..b7e6f710 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.2.4' +gem 'rails', '~> 6.0.3' gem 'sassc-rails', '~> 2.1.2' gem 'coffee-rails', '~> 5.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 0126714c..36556806 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,57 +11,70 @@ GEM RedCloth (4.3.2) aasm (4.12.3) concurrent-ruby (~> 1.0) - actioncable (5.2.4.3) - actionpack (= 5.2.4.3) + actioncable (6.0.3.2) + actionpack (= 6.0.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) + actionmailbox (6.0.3.2) + actionpack (= 6.0.3.2) + activejob (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) + mail (>= 2.7.1) + actionmailer (6.0.3.2) + actionpack (= 6.0.3.2) + actionview (= 6.0.3.2) + activejob (= 6.0.3.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.3) - actionview (= 5.2.4.3) - activesupport (= 5.2.4.3) + actionpack (6.0.3.2) + actionview (= 6.0.3.2) + activesupport (= 6.0.3.2) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.4.3) - activesupport (= 5.2.4.3) + actiontext (6.0.3.2) + actionpack (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) + nokogiri (>= 1.8.5) + actionview (6.0.3.2) + activesupport (= 6.0.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.3) - activesupport (= 5.2.4.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.2) + activesupport (= 6.0.3.2) globalid (>= 0.3.6) - activemodel (5.2.4.3) - activesupport (= 5.2.4.3) + activemodel (6.0.3.2) + activesupport (= 6.0.3.2) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.4.3) - activemodel (= 5.2.4.3) - activesupport (= 5.2.4.3) - arel (>= 9.0) - activestorage (5.2.4.3) - actionpack (= 5.2.4.3) - activerecord (= 5.2.4.3) + activerecord (6.0.3.2) + activemodel (= 6.0.3.2) + activesupport (= 6.0.3.2) + activestorage (6.0.3.2) + actionpack (= 6.0.3.2) + activejob (= 6.0.3.2) + activerecord (= 6.0.3.2) marcel (~> 0.3.1) - activesupport (5.2.4.3) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) acts_as_list (1.0.1) activerecord (>= 4.2) - arel (9.0.0) ast (2.4.1) autoprefixer-rails (9.4.7) execjs @@ -159,18 +172,20 @@ GEM rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.3) - actioncable (= 5.2.4.3) - actionmailer (= 5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) - activemodel (= 5.2.4.3) - activerecord (= 5.2.4.3) - activestorage (= 5.2.4.3) - activesupport (= 5.2.4.3) + rails (6.0.3.2) + actioncable (= 6.0.3.2) + actionmailbox (= 6.0.3.2) + actionmailer (= 6.0.3.2) + actionpack (= 6.0.3.2) + actiontext (= 6.0.3.2) + actionview (= 6.0.3.2) + activejob (= 6.0.3.2) + activemodel (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) bundler (>= 1.3.0) - railties (= 5.2.4.3) + railties (= 6.0.3.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -183,12 +198,12 @@ GEM loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) - railties (5.2.4.3) - actionpack (= 5.2.4.3) - activesupport (= 5.2.4.3) + railties (6.0.3.2) + actionpack (= 6.0.3.2) + activesupport (= 6.0.3.2) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) rake (13.0.1) rb-fsevent (0.10.4) @@ -282,6 +297,7 @@ GEM websocket-extensions (0.1.5) will_paginate (3.3.0) yard (0.9.25) + zeitwerk (2.4.0) PLATFORMS ruby @@ -312,7 +328,7 @@ DEPENDENCIES paperclip puma (~> 4.3) rack-mini-profiler - rails (~> 5.2.4) + rails (~> 6.0.3) rails-controller-testing rails-dom-testing (~> 2.0.0) rails_autolink From 7c8fe5c9bebafee27b657ba4e5c8fc20d9eeedd8 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 20 Aug 2020 14:07:45 +0300 Subject: [PATCH 163/767] Whitespace changes --- config/secrets.yml | 4 ++-- config/site.yml.tmpl | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/secrets.yml b/config/secrets.yml index c2dfb2e5..17a7e526 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -19,10 +19,10 @@ development: secret_key_base: <%= SITE_CONFIG["secret_token"] || SecureRandom.hex(64) %> - + test: secret_key_base: <%= SITE_CONFIG["secret_token"] || SecureRandom.hex(64) %> - + # Do not keep production secrets in the unencrypted secrets file. # Instead, either read values from the environment. # Or, use `bin/rails secrets:setup` to configure encrypted secrets diff --git a/config/site.yml.tmpl b/config/site.yml.tmpl index bd000214..c648632d 100644 --- a/config/site.yml.tmpl +++ b/config/site.yml.tmpl @@ -2,8 +2,8 @@ authentication_schemes: - "database" -# You'll probably want to change this to the time zone of the computer where -# Tracks is running. Run rake time:zones:local have Rails suggest time zone +# You'll probably want to change this to the time zone of the computer where +# Tracks is running. Run rake time:zones:local have Rails suggest time zone # names on your system time_zone: "UTC" @@ -15,7 +15,7 @@ secure_cookies: false # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. # -# if you want a nice random key, run this from the tracks directory and +# if you want a nice random key, run this from the tracks directory and # copy-and-paste the result: # # rake secret @@ -25,17 +25,17 @@ secret_token: "change-me" # Set to true when your application is running with https force_ssl: false -# Uncomment if you want to dispatch todos that come from email based on the To: +# Uncomment if you want to dispatch todos that come from email based on the To: # address rather than the From: address. # email_dispatch: 'to' -# If you want to send all email to a specific user, uncomment the following line -# and set the environment variable TRACKS_MAIL_RECEIVER to the login name of the +# If you want to send all email to a specific user, uncomment the following line +# and set the environment variable TRACKS_MAIL_RECEIVER to the login name of the # user that will receive all email # email_dispatch: 'single_user' -# Set this to the subdirectory you're hosting tracks in and uncomment if -# applicable. NOTE: you will also need to set up your web server to deal with +# Set this to the subdirectory you're hosting tracks in and uncomment if +# applicable. NOTE: you will also need to set up your web server to deal with # the relative URL. Mongrel, for example, has a --prefix option. # subdir: "/tracks" @@ -48,8 +48,8 @@ open_signups: false # Set to require TOS approval on signup. #tos_link: "https://www.example.com" -# When integrating your tracks instance with http://cloudmailin.com/ by using -# the /integrations/cloudmailin URL, this value is the cloudmailin-secret for +# When integrating your tracks instance with http://cloudmailin.com/ by using +# the /integrations/cloudmailin URL, this value is the cloudmailin-secret for # verifying the authenticity of the request. # (see http://docs.cloudmailin.com/validating_the_sender) # cloudmailin: asdasd @@ -57,7 +57,7 @@ open_signups: false # Mailgun api key - used to verify incoming HTTP requests from Mailgun.org # mailgun_api_key: key-abcdef1234567890 -# change this to reflect the email address of the admin that you want to show +# change this to reflect the email address of the admin that you want to show # on the signup page admin_email: my.email@domain.com From a0768636c360435b2515de2e45c5b4b25acb255b Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 20 Aug 2020 18:33:36 +0300 Subject: [PATCH 164/767] Try fixing a few test deprecations --- app/controllers/preferences_controller.rb | 4 +- app/models/context.rb | 2 +- app/models/project.rb | 2 +- app/models/user.rb | 2 +- app/views/contexts/show.html.erb | 2 +- app/views/feedlist/index.html.erb | 2 +- app/views/projects/show.html.erb | 2 +- app/views/todos/index.html.erb | 4 +- app/views/todos/tag.html.erb | 2 +- test/controllers/contexts_controller_test.rb | 42 +++++++++----------- test/controllers/projects_controller_test.rb | 8 ++-- test/controllers/todos_controller_test.rb | 16 ++++---- test/models/user_test.rb | 4 +- 13 files changed, 43 insertions(+), 49 deletions(-) diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb index 3becc7d0..1875eb8e 100644 --- a/app/controllers/preferences_controller.rb +++ b/app/controllers/preferences_controller.rb @@ -9,8 +9,8 @@ class PreferencesController < ApplicationController def update @prefs = current_user.prefs @user = current_user - user_updated = current_user.update_attributes(user_params) - prefs_updated = current_user.preference.update_attributes(prefs_params) + user_updated = current_user.update(user_params) + prefs_updated = current_user.preference.update(prefs_params) if (user_updated && prefs_updated) if params['user']['password'].present? # password updated? logout_user t('preferences.password_changed') diff --git a/app/models/context.rb b/app/models/context.rb index f9331fcb..2eaad6fb 100644 --- a/app/models/context.rb +++ b/app/models/context.rb @@ -35,7 +35,7 @@ class Context < ApplicationRecord validates_presence_of :name, :message => "context must have a name" validates_length_of :name, :maximum => 255, :message => "context name must be less than 256 characters" - validates_uniqueness_of :name, :message => "already exists", :scope => "user_id" + validates_uniqueness_of :name, :message => "already exists", :scope => "user_id", :case_sensitive => false def self.null_object NullContext.new diff --git a/app/models/project.rb b/app/models/project.rb index d10594a9..c7e62a85 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -18,7 +18,7 @@ class Project < ApplicationRecord validates_presence_of :name validates_length_of :name, :maximum => 255 - validates_uniqueness_of :name, :scope => "user_id" + validates_uniqueness_of :name, :scope => "user_id", :case_sensitive => true acts_as_list :scope => 'user_id = #{user_id} AND state = \'#{state}\'', :top_of_list => 0 diff --git a/app/models/user.rb b/app/models/user.rb index d68cf40f..87b2837f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -105,7 +105,7 @@ class User < ApplicationRecord validates_presence_of :password_confirmation, if: :password_required? validates_confirmation_of :password validates_length_of :login, within: 3..80 - validates_uniqueness_of :login, on: :create + validates_uniqueness_of :login, on: :create, :case_sensitive => false validate :validate_auth_type validates :email, :allow_blank => true, format: { with: URI::MailTo::EMAIL_REGEXP } diff --git a/app/views/contexts/show.html.erb b/app/views/contexts/show.html.erb index 6b6460c7..f9e111ab 100644 --- a/app/views/contexts/show.html.erb +++ b/app/views/contexts/show.html.erb @@ -21,5 +21,5 @@
        <%= render :partial => "shared/add_new_item_form" %> - <%= render :file => "sidebar/sidebar" %> + <%= render :template => "sidebar/sidebar" %>
        diff --git a/app/views/feedlist/index.html.erb b/app/views/feedlist/index.html.erb index 544282fe..3bf2318b 100644 --- a/app/views/feedlist/index.html.erb +++ b/app/views/feedlist/index.html.erb @@ -19,5 +19,5 @@
        - <%= render :file => "sidebar/sidebar" %> + <%= render :template => "sidebar/sidebar" %>
        diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 0696e175..090371eb 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -42,5 +42,5 @@
        <%= render :partial => "shared/add_new_item_form" %> - <%= render :file => "sidebar/sidebar" %> + <%= render :template => "sidebar/sidebar" %>
        diff --git a/app/views/todos/index.html.erb b/app/views/todos/index.html.erb index 11b85cca..54042a9c 100644 --- a/app/views/todos/index.html.erb +++ b/app/views/todos/index.html.erb @@ -12,5 +12,5 @@
        <%= render :partial => "shared/add_new_item_form" %> - <%= render :file => "sidebar/sidebar" %> -
        \ No newline at end of file + <%= render :template => "sidebar/sidebar" %> + diff --git a/app/views/todos/tag.html.erb b/app/views/todos/tag.html.erb index 1c20c5fc..55a4120c 100644 --- a/app/views/todos/tag.html.erb +++ b/app/views/todos/tag.html.erb @@ -27,5 +27,5 @@
        <%= render :partial => "shared/add_new_item_form" %> - <%= render :file => "sidebar/sidebar" %> + <%= render :template => "sidebar/sidebar" %>
        diff --git a/test/controllers/contexts_controller_test.rb b/test/controllers/contexts_controller_test.rb index 10adb746..f1660f95 100644 --- a/test/controllers/contexts_controller_test.rb +++ b/test/controllers/contexts_controller_test.rb @@ -10,7 +10,7 @@ class ContextsControllerTest < ActionController::TestCase login_as :admin_user get :index end - + def test_show_sets_title login_as :admin_user get :show, params: { :id => "1" } @@ -32,7 +32,7 @@ class ContextsControllerTest < ActionController::TestCase get :show, params: { :id => "1" } assert_template "contexts/show" end - + def test_get_edit_form_using_xhr login_as(:admin_user) get :edit, xhr: true, params: { :id => contexts(:errand).id } @@ -54,26 +54,25 @@ class ContextsControllerTest < ActionController::TestCase end # TXT feed - def test_text_feed_content login_as :admin_user get :index, params: { :format => "txt" } - assert_equal 'text/plain', @response.content_type + assert_equal 'text/plain', @response.media_type assert !(/ /.match(@response.body)) end - + def test_text_feed_not_accessible_to_anonymous_user_without_token login_as nil get :index, params: { :format => "txt" } assert_response 401 end - + def test_text_feed_not_accessible_to_anonymous_user_with_invalid_token login_as nil get :index, params: { :format => "txt", :token => 'foo' } assert_response 401 end - + def test_text_feed_accessible_to_anonymous_user_with_valid_token login_as nil get :index, params: { :format => "txt", :token => users(:admin_user).token } @@ -81,35 +80,33 @@ class ContextsControllerTest < ActionController::TestCase end # REST xml - def test_show_xml_renders_context_to_xml login_as :admin_user get :show, params: { :id => "1", :format => 'xml' } assert_equal contexts(:agenda).to_xml( :except => :user_id ), @response.body end - + def test_show_with_nil_context_returns_404 login_as :admin_user get :show, params: { :id => "0" } assert_equal 'Context not found', @response.body assert_response 404 end - + def test_show_xml_with_nil_context_returns_404 login_as :admin_user get :show, params: { :id => "0", :format => 'xml' } assert_response 404 assert_select 'error', 'Context not found' end - - # RSS + # RSS def test_rss_feed_content login_as :admin_user get :index, params: { :format => "rss" } - assert_equal 'application/rss+xml', @response.content_type + assert_equal 'application/rss+xml', @response.media_type #puts @response.body - + assert_select 'rss[version="2.0"]' do assert_select 'channel' do assert_select '>title', 'Tracks Contexts' @@ -131,19 +128,19 @@ class ContextsControllerTest < ActionController::TestCase end end end - + def test_rss_feed_not_accessible_to_anonymous_user_without_token login_as nil get :index, params: { :format => "rss" } assert_response 401 end - + def test_rss_feed_not_accessible_to_anonymous_user_with_invalid_token login_as nil get :index, params: { :format => "rss", :token => 'foo' } assert_response 401 end - + def test_rss_feed_accessible_to_anonymous_user_with_valid_token login_as nil get :index, params: { :format => "rss", :token => users(:admin_user).token } @@ -151,11 +148,10 @@ class ContextsControllerTest < ActionController::TestCase end # ATOM - def test_atom_feed_content login_as :admin_user get :index, params: { :format => "atom" } - assert_equal 'application/atom+xml', @response.content_type + assert_equal 'application/atom+xml', @response.media_type assert_equal 'http://www.w3.org/2005/Atom', html_document.children[0].namespace.href assert_select 'feed' do assert_select '>title', 'Tracks Contexts' @@ -171,24 +167,22 @@ class ContextsControllerTest < ActionController::TestCase end end end - + def test_atom_feed_not_accessible_to_anonymous_user_without_token login_as nil get :index, params: { :format => "atom" } assert_response 401 end - + def test_atom_feed_not_accessible_to_anonymous_user_with_invalid_token login_as nil get :index, params: { :format => "atom", :token => 'foo' } assert_response 401 end - + def test_atom_feed_accessible_to_anonymous_user_with_valid_token login_as nil get :index, params: { :format => "atom", :token => users(:admin_user).token } assert_response :ok end - - end diff --git a/test/controllers/projects_controller_test.rb b/test/controllers/projects_controller_test.rb index 023d82ba..4666dddd 100644 --- a/test/controllers/projects_controller_test.rb +++ b/test/controllers/projects_controller_test.rb @@ -82,7 +82,7 @@ class ProjectsControllerTest < ActionController::TestCase def test_rss_feed_content login_as(:admin_user) get :index, params: { :format => "rss" } - assert_equal 'application/rss+xml', @response.content_type + assert_equal 'application/rss+xml', @response.media_type #puts @response.body assert_select 'rss[version="2.0"]' do @@ -128,7 +128,7 @@ class ProjectsControllerTest < ActionController::TestCase def test_atom_feed_content login_as :admin_user get :index, params: { :format => "atom" } - assert_equal 'application/atom+xml', @response.content_type + assert_equal 'application/atom+xml', @response.media_type assert_equal 'http://www.w3.org/2005/Atom', html_document.children[0].namespace.href assert_select 'feed' do assert_select '>title', 'Tracks Projects' @@ -166,7 +166,7 @@ class ProjectsControllerTest < ActionController::TestCase def test_text_feed_content login_as :admin_user get :index, params: { :format => "txt" } - assert_equal 'text/plain', @response.content_type + assert_equal 'text/plain', @response.media_type assert !(/ /.match(@response.body)) end @@ -238,7 +238,7 @@ class ProjectsControllerTest < ActionController::TestCase def test_xml_content login_as(:admin_user) get :index, params: { :format => "xml" } - assert_equal 'application/xml', @response.content_type + assert_equal 'application/xml', @response.media_type assert_select 'projects' do assert_select 'project', 3 do diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index 731b8497..70983854 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -128,17 +128,17 @@ class TodosControllerTest < ActionController::TestCase get :tag, params: { name: 'first.last.m' } assert_equal "text/html", request.format, "controller should set right content type" - assert_equal "text/html", @response.content_type + assert_equal "text/html", @response.media_type assert_equal "first.last", assigns['tag_name'], ".m should be chomped" get :tag, params: { name: 'first.last.txt' } assert_equal "text/plain", request.format, "controller should set right content type" - assert_equal "text/plain", @response.content_type + assert_equal "text/plain", @response.media_type assert_equal "first.last", assigns['tag_name'], ".txt should be chomped" get :tag, params: { name: 'first.last' } assert_equal "text/html", request.format, "controller should set right content type" - assert_equal "text/html", @response.content_type + assert_equal "text/html", @response.media_type assert_equal "first.last", assigns['tag_name'], ":name should be correct" end @@ -479,7 +479,7 @@ class TodosControllerTest < ActionController::TestCase def test_rss_feed_not_completed login_as(:admin_user) get :index, params: { :format => "rss" } - assert_equal 'application/rss+xml', @response.content_type + assert_equal 'application/rss+xml', @response.media_type # puts @response.body assert_select 'rss[version="2.0"]' do @@ -502,7 +502,7 @@ class TodosControllerTest < ActionController::TestCase def test_atom_feed_not_completed login_as :admin_user get :index, params: { :format => "atom" } - assert_equal 'application/atom+xml', @response.content_type + assert_equal 'application/atom+xml', @response.media_type assert_equal 'http://www.w3.org/2005/Atom', html_document.children[0].namespace.href assert_select 'feed' do assert_select '>title', 'Tracks Actions' @@ -518,7 +518,7 @@ class TodosControllerTest < ActionController::TestCase def test_text_feed_not_completed login_as(:admin_user) get :index, params: { :format => "txt" } - assert_equal 'text/plain', @response.content_type + assert_equal 'text/plain', @response.media_type assert !(/ /.match(@response.body)) assert_number_of_items_in_text_feed 11 end @@ -526,7 +526,7 @@ class TodosControllerTest < ActionController::TestCase def test_ical_feed_not_completed login_as :admin_user get :index, params: { :format => "ics" } - assert_equal 'text/calendar', @response.content_type + assert_equal 'text/calendar', @response.media_type assert !(/ /.match(@response.body)) assert_number_of_items_in_ical_feed 11 end @@ -756,7 +756,7 @@ class TodosControllerTest < ActionController::TestCase def test_mobile_index_uses_text_html_content_type login_as(:admin_user) get :index, params: { :format => "m" } - assert_equal 'text/html', @response.content_type + assert_equal 'text/html', @response.media_type end def test_mobile_index_assigns_down_count diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 66d5c801..607a0ff1 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -274,12 +274,12 @@ class UserTest < ActiveSupport::TestCase end def test_should_reset_password - users(:other_user).update_attributes(:password => 'new password', :password_confirmation => 'new password') + users(:other_user).update(:password => 'new password', :password_confirmation => 'new password') assert_equal users(:other_user), User.authenticate('jane', 'new password') end def test_should_not_rehash_password - users(:other_user).update_attributes(:login => 'jane2') + users(:other_user).update(:login => 'jane2') assert_equal users(:other_user), User.authenticate('jane2', 'sesame') end From b072d8ab2d7ba775cb62510be99ef048781a01a0 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 21 Aug 2020 18:54:37 +0300 Subject: [PATCH 165/767] Create SECURITY.md --- SECURITY.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..983f5d2c --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,14 @@ +# Security Policy + +## Supported Versions + +| Version | Supported | +| ------- | ------------------ | +| 2.4.x | :white_check_mark: | +| <2.4.x | :x: | + +## Reporting a Vulnerability + +Please report any security issues via email to security@getontracks.org. If you don't get a reply for your email, resend the email after one week. If there's still no reply, open an issue in the issue queue but *do not disclose the details* in the issue, only ask about the reply and status. + +Unfortunately Tracks is not part of a bug bounty program, but we do provide appropriate credits for disclosing security issues. From 60885c0893075d774a6d4971cff2f8e06707b284 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 05:53:55 +0000 Subject: [PATCH 166/767] Bump spring from 2.1.0 to 2.1.1 Bumps [spring](https://github.com/rails/spring) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/rails/spring/releases) - [Changelog](https://github.com/rails/spring/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/spring/compare/v2.1.0...v2.1.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 36556806..60f3c4c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - spring (2.1.0) + spring (2.1.1) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) From e0d6b25f353d5bfc7935309051cfc3ef62eb53ef Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 25 Aug 2020 17:33:21 +0300 Subject: [PATCH 167/767] Fix the AASM Proc calls --- app/models/recurring_todo.rb | 4 ++-- app/models/todo.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb index d3daf9ac..2c082fbf 100644 --- a/app/models/recurring_todo.rb +++ b/app/models/recurring_todo.rb @@ -12,8 +12,8 @@ class RecurringTodo < ApplicationRecord include AASM aasm :column => :state do - state :active, :initial => true, :before_enter => Proc.new { occurrences_count = 0 } - state :completed, :before_enter => Proc.new { completed_at = Time.zone.now }, :before_exit => Proc.new { completed_at = nil } + state :active, :initial => true, :before_enter => Proc.new { self.occurrences_count = 0 } + state :completed, :before_enter => Proc.new { self.completed_at = Time.zone.now }, :before_exit => Proc.new { self.completed_at = nil } event :complete do transitions :to => :completed, :from => [:active] diff --git a/app/models/todo.rb b/app/models/todo.rb index ba067946..f40da3ca 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -70,13 +70,13 @@ class Todo < ApplicationRecord # state machine include AASM - aasm_initial_state = Proc.new { (show_from && user && (show_from > user.date)) ? :deferred : :active} + aasm_initial_state = Proc.new { (self.show_from && self.user && (self.show_from > self.user.date)) ? :deferred : :active} aasm :column => :state do state :active - state :completed, :before_enter => Proc.new { completed_at = Time.zone.now }, :before_exit => Proc.new { completed_at = nil} - state :deferred, :before_exit => Proc.new { show_from = nil } + state :completed, :before_enter => Proc.new { self.completed_at = Time.zone.now }, :before_exit => Proc.new { self.completed_at = nil} + state :deferred, :before_exit => Proc.new { self[:show_from] = nil } state :pending event :defer do From 998bfa4248ff5286ea9bcd62c532b357e2b73697 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 25 Aug 2020 19:08:23 +0300 Subject: [PATCH 168/767] Version 2.5.0 --- README.md | 9 ++++----- config/initializers/tracks.rb | 2 +- doc/CHANGELOG.md | 25 +++++++++++++++++++++++++ doc/upgrading.md | 23 ++++++++++++++++++++++- 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4fe99891..c4cb75e7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Tracks: a GTD(TM) web application, built with Ruby on Rails +[![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions) +[![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks) + * Project homepage: http://www.getontracks.org/ * Manual: http://www.getontracks.org/manual/ * Source at GitHub: https://github.com/TracksApp/tracks @@ -13,9 +16,6 @@ * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors * License: See COPYING -[![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions) -[![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks) - Full instructions for both new installations and upgrades from older installations of Tracks can be found in the [wiki](https://github.com/TracksApp/tracks/wiki/Installation). @@ -23,8 +23,7 @@ If you are thinking about contributing towards the development of Tracks, please read /CONTRIBUTING.md for general information. Also you can find some information on development, testing and contributing on the wiki. -While fully usable for everyday use, Tracks is still a work in progress. Make -sure that you take sensible precautions and back up all your data frequently, +As always, make sure that you take sensible precautions and back up all your data frequently, taking particular care when you are upgrading. Enjoy being productive! diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb index 5d85d5be..b7b99dcc 100644 --- a/config/initializers/tracks.rb +++ b/config/initializers/tracks.rb @@ -1,4 +1,4 @@ -tracks_version='2.4.2' +tracks_version='2.5.0' # comment out next two lines if you do not want (or can not) the date of the # last git commit in the footer info=`git log --pretty=format:"%ai" -1` diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index b29aa9e4..657cf54a 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,28 @@ +## Version 2.5.0 + +See doc/upgrading.md for the upgrade documentation! + +### New features +* Updated documentation both in the doc directory and online. +* .skip-docker file has been replaced with .use-docker, see upgrading.md for + details. +* Added email, last login, creation and update time to the user model. +* Added terms of service and email fields to the signup form. The TOS link is + defined in site.yml, see config/site.yml.tmpl. +* New, lighter default color scheme. The black color scheme is also available + for selection in the user preferences. Default theme can be set in site.yml. +* Added a help page to the ? menu linking to online help assets. +* Allow the user to remove their own account. + +### Removed features +* Ruby versions below 2.5 are no longer supported. +* Old Internet Explorer versions (7 and 8) are no longer supported. + +### Bug fixes +* Fixed the signup form to use login form styles. +* Lots of dependencies have been upgraded, including Rails major upgrade. +* Fixed some minor UI bugs. + ## Version 2.4.2 ### New features diff --git a/doc/upgrading.md b/doc/upgrading.md index 8e481ddf..b6c3eddd 100644 --- a/doc/upgrading.md +++ b/doc/upgrading.md @@ -1,5 +1,26 @@ # Upgrading Tracks -## Upgrading from Tracks 2.4.2 to 2.5 + +## General upgrade instructions + +* Remember to always backup your database before upgrading! Test before + upgrading production environments. + +* For information regarding installation see doc/installation.md. + +* Make sure to run database migrations using one one of the following: +``` + # For pure (Dockerless) installation: + $ rake db:migrate + + # For Docker Compose installation: + $ bin/rake db:migrate + + # For separate Docker container installation either one of: + $ docker run --link mariadb:db --rm -t tracks bin/rake db:migrate + $ docker run --link postgres:db --rm -t tracks bin/rake db:migrate +``` + +## Upgrading from Tracks 2.4.2 to 2.5.0 * If you're using the Docker Compose environment and want to run the commands in the bin/ directory inside the container from the host system, add a .use-docker From e25c50503c017488e7e993b2bd4458b77776b06b Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 25 Aug 2020 21:46:27 +0300 Subject: [PATCH 169/767] Fix the jquery requires in the stylesheets and the missing Yarn warning. --- Dockerfile | 4 ++++ app/assets/stylesheets/black.scss | 12 ++++++++++++ app/assets/stylesheets/include/manifest.scss | 7 ------- app/assets/stylesheets/light_blue.scss | 12 ++++++++++++ 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b1bcce07..bf82d720 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,10 @@ COPY Gemfile* /app/ RUN gem install bundler RUN bundle install --jobs 4 +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get update && apt-get install -y yarn + RUN mkdir /app/log COPY . /app/ diff --git a/app/assets/stylesheets/black.scss b/app/assets/stylesheets/black.scss index 86647a0b..25d59126 100644 --- a/app/assets/stylesheets/black.scss +++ b/app/assets/stylesheets/black.scss @@ -1,3 +1,15 @@ +/* + * Apparently the requires need to be in the "root" stylesheet file, not + * the imported manifest. + * + *= require jquery-ui/menu + *= require jquery-ui/autocomplete + *= require jquery-ui/datepicker + *= require jquery-ui/dialog + *= require jquery-ui/sortable + *= require_self + */ + $gray-lighter: #EEE; $brand-primary: rgba(0, 0, 0, 0.75); $navbar-inverse-bg: $brand_primary; diff --git a/app/assets/stylesheets/include/manifest.scss b/app/assets/stylesheets/include/manifest.scss index ce2e368d..12066267 100644 --- a/app/assets/stylesheets/include/manifest.scss +++ b/app/assets/stylesheets/include/manifest.scss @@ -9,13 +9,6 @@ * compiled file so the styles you add here take precedence over styles defined in any styles * defined in the other CSS/SCSS files in this directory. It is generally better to create a new * file per style scope. - * - *= require jquery-ui/menu - *= require jquery-ui/autocomplete - *= require jquery-ui/datepicker - *= require jquery-ui/dialog - *= require jquery-ui/sortable - *= require_self */ @import "icons"; diff --git a/app/assets/stylesheets/light_blue.scss b/app/assets/stylesheets/light_blue.scss index 9d6ea71e..8a9405e8 100644 --- a/app/assets/stylesheets/light_blue.scss +++ b/app/assets/stylesheets/light_blue.scss @@ -1,3 +1,15 @@ +/* + * Apparently the requires need to be in the "root" stylesheet file, not + * the imported manifest. + * + *= require jquery-ui/menu + *= require jquery-ui/autocomplete + *= require jquery-ui/datepicker + *= require jquery-ui/dialog + *= require jquery-ui/sortable + *= require_self + */ + $gray-lighter: lighten(#000, 93.5%); $brand-primary: #3C6997; $navbar-inverse-bg: $brand_primary; From e89511aec8f7adadde11d957622eec9106389e48 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 26 Aug 2020 00:38:06 +0300 Subject: [PATCH 170/767] Run tests on all supported platforms --- .github/workflows/continuous-integration.yml | 33 ++++++++++++++++++-- Dockerfile-2.5 | 30 ++++++++++++++++++ Dockerfile-2.7 | 30 ++++++++++++++++++ Gemfile | 2 +- Gemfile.lock | 2 ++ script/cibuild | 10 ++++-- test-envs/docker-compose-2.5-mysql.yml | 29 +++++++++++++++++ test-envs/docker-compose-2.6-mysql.yml | 29 +++++++++++++++++ test-envs/docker-compose-2.6-postgres.yml | 32 +++++++++++++++++++ test-envs/docker-compose-2.6-sqlite.yml | 17 ++++++++++ test-envs/docker-compose-2.7-mysql.yml | 29 +++++++++++++++++ 11 files changed, 237 insertions(+), 6 deletions(-) create mode 100644 Dockerfile-2.5 create mode 100644 Dockerfile-2.7 create mode 100644 test-envs/docker-compose-2.5-mysql.yml create mode 100644 test-envs/docker-compose-2.6-mysql.yml create mode 100644 test-envs/docker-compose-2.6-postgres.yml create mode 100644 test-envs/docker-compose-2.6-sqlite.yml create mode 100644 test-envs/docker-compose-2.7-mysql.yml diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index c2a51a65..73143937 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,11 +1,38 @@ --- -name: Continuous Integration +name: Automated tests on: pull_request jobs: - test: + test25mysql: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: bash -x script/cibuild + - run: bash -x script/cibuild 2.5 mysql + + test26mysql: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash -x script/cibuild 2.6 mysql + + test27mysql: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash -x script/cibuild 2.7 mysql + + test26postgres: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash -x script/cibuild 2.6 postgres + + test26sqlite: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash -x script/cibuild 2.6 sqlite + +# - run: bash -x script/cibuild 2.5 postgres +# - run: bash -x script/cibuild 2.7 postgres diff --git a/Dockerfile-2.5 b/Dockerfile-2.5 new file mode 100644 index 00000000..a3fb50a1 --- /dev/null +++ b/Dockerfile-2.5 @@ -0,0 +1,30 @@ +FROM ruby:2.5 + +# throw errors if Gemfile has been modified since Gemfile.lock +RUN bundle config --global frozen 1 + +WORKDIR /app + +RUN touch /etc/app-env + +COPY Gemfile* /app/ +RUN gem install bundler +RUN bundle install --jobs 4 + +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get update && apt-get install -y yarn + +RUN mkdir /app/log + +COPY . /app/ +COPY config/database.docker.yml /app/config/database.yml +COPY config/site.docker.yml /app/config/site.yml + +RUN RAILS_ENV=production bundle exec rake assets:precompile + +ENTRYPOINT ["/app/docker-entrypoint.sh"] + +EXPOSE 3000 + +CMD ["rails", "server", "-b", "0.0.0.0"] diff --git a/Dockerfile-2.7 b/Dockerfile-2.7 new file mode 100644 index 00000000..a68b373d --- /dev/null +++ b/Dockerfile-2.7 @@ -0,0 +1,30 @@ +FROM ruby:2.7 + +# throw errors if Gemfile has been modified since Gemfile.lock +RUN bundle config --global frozen 1 + +WORKDIR /app + +RUN touch /etc/app-env + +COPY Gemfile* /app/ +RUN gem install bundler +RUN bundle install --jobs 4 + +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get update && apt-get install -y yarn + +RUN mkdir /app/log + +COPY . /app/ +COPY config/database.docker.yml /app/config/database.yml +COPY config/site.docker.yml /app/config/site.yml + +RUN RAILS_ENV=production bundle exec rake assets:precompile + +ENTRYPOINT ["/app/docker-entrypoint.sh"] + +EXPOSE 3000 + +CMD ["rails", "server", "-b", "0.0.0.0"] diff --git a/Gemfile b/Gemfile index 8883213e..7db4a340 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,7 @@ gem 'jquery-ui-rails' , '~>6.0.1' # Alternatively use --without arguments to bundler to not install that group gem "sqlite3", group: :sqlite gem "mysql2", "~> 0.5.3", group: :mysql +gem "pg", "~> 1.2.3", group: :postgresql gem "RedCloth" gem "sanitize", "~> 5.2" @@ -70,7 +71,6 @@ group :test do gem 'rails-controller-testing' gem 'rails-dom-testing', '~> 2.0.0' - gem "factory_bot_rails" gem "rspec-expectations" gem "database_cleaner" diff --git a/Gemfile.lock b/Gemfile.lock index 1892e92c..02fdaf44 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,6 +165,7 @@ GEM parallel (1.19.2) parser (2.7.1.4) ast (~> 2.4.1) + pg (1.2.3) puma (4.3.5) nio4r (~> 2.0) rack (2.2.3) @@ -326,6 +327,7 @@ DEPENDENCIES mocha mysql2 (~> 0.5.3) paperclip + pg (~> 1.2.3) puma (~> 4.3) rack-mini-profiler rails (~> 6.0.3) diff --git a/script/cibuild b/script/cibuild index 783a1833..564941a4 100755 --- a/script/cibuild +++ b/script/cibuild @@ -2,7 +2,7 @@ set -e -docker_compose="docker-compose --file docker-compose.yml" +docker_compose="docker-compose --file test-envs/docker-compose-$1-$2.yml" function cleanup() { $docker_compose down @@ -25,6 +25,12 @@ script/poll-for-db # Leaving this in since it will be needed for Rails 5 $docker_compose run web bin/rails db:environment:set RAILS_ENV=test || true -$docker_compose run web bin/rake db:reset +if [ "$2" == "mysql" ]; +then + $docker_compose run web bin/rake db:reset +else + $docker_compose run web bin/rake db:migrate + $docker_compose run web bin/rake db:seed +fi $docker_compose run web bin/rake test diff --git a/test-envs/docker-compose-2.5-mysql.yml b/test-envs/docker-compose-2.5-mysql.yml new file mode 100644 index 00000000..249e1f35 --- /dev/null +++ b/test-envs/docker-compose-2.5-mysql.yml @@ -0,0 +1,29 @@ +version: '3' +services: + db: + image: mysql:5.7 + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: 1 + MYSQL_DATABASE: ${TRACKS_DB:-tracks} + volumes: + - db-data:/var/lib/mysql + web: + build: + context: .. + dockerfile: Dockerfile-2.5 + environment: + # These are set in script/ci-build, so we need to pass-thru them. + RAILS_ENV: $RAILS_ENV + DATABASE_NAME: $DATABASE_NAME + DATABASE_USERNAME: root + DATABASE_PASSWORD_EMPTY: 1 + volumes: + - ${VOLUME:-..}:/app:Z + - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z + - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z + ports: + - 3000:3000 + depends_on: + - db +volumes: + db-data: diff --git a/test-envs/docker-compose-2.6-mysql.yml b/test-envs/docker-compose-2.6-mysql.yml new file mode 100644 index 00000000..67e67f17 --- /dev/null +++ b/test-envs/docker-compose-2.6-mysql.yml @@ -0,0 +1,29 @@ +version: '3' +services: + db: + image: mysql:5.7 + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: 1 + MYSQL_DATABASE: ${TRACKS_DB:-tracks} + volumes: + - db-data:/var/lib/mysql + web: + build: + context: .. + dockerfile: Dockerfile + environment: + # These are set in script/ci-build, so we need to pass-thru them. + RAILS_ENV: $RAILS_ENV + DATABASE_NAME: $DATABASE_NAME + DATABASE_USERNAME: root + DATABASE_PASSWORD_EMPTY: 1 + volumes: + - ${VOLUME:-..}:/app:Z + - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z + - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z + ports: + - 3000:3000 + depends_on: + - db +volumes: + db-data: diff --git a/test-envs/docker-compose-2.6-postgres.yml b/test-envs/docker-compose-2.6-postgres.yml new file mode 100644 index 00000000..a66d41b2 --- /dev/null +++ b/test-envs/docker-compose-2.6-postgres.yml @@ -0,0 +1,32 @@ +version: '3' +services: + db: + image: postgres:13 + environment: + POSTGRES_DB: ${DATABASE_NAME:-tracks} + POSTGRES_PASSWORD: password + volumes: + - db-data:/var/lib/postgresql/data + web: + build: + context: .. + dockerfile: Dockerfile + environment: + # These are set in script/ci-build, so we need to pass-thru them. + RAILS_ENV: $RAILS_ENV + DATABASE_NAME: $DATABASE_NAME + DATABASE_USERNAME: postgres + DATABASE_PASSWORD: password + DATABASE_TYPE: postgresql + DATABASE_ENCODING: unicode + DATABASE_PORT: 5432 + volumes: + - ${VOLUME:-..}:/app:Z + - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z + - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z + ports: + - 3000:3000 + depends_on: + - db +volumes: + db-data: diff --git a/test-envs/docker-compose-2.6-sqlite.yml b/test-envs/docker-compose-2.6-sqlite.yml new file mode 100644 index 00000000..4fd50bd5 --- /dev/null +++ b/test-envs/docker-compose-2.6-sqlite.yml @@ -0,0 +1,17 @@ +version: '3' +services: + web: + build: + context: .. + dockerfile: Dockerfile + environment: + # These are set in script/ci-build, so we need to pass-thru them. + RAILS_ENV: $RAILS_ENV + DATABASE_NAME: "/app/db.sqlite" + DATABASE_TYPE: sqlite3 + volumes: + - ${VOLUME:-..}:/app:Z + - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z + - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z + ports: + - 3000:3000 diff --git a/test-envs/docker-compose-2.7-mysql.yml b/test-envs/docker-compose-2.7-mysql.yml new file mode 100644 index 00000000..58e433ff --- /dev/null +++ b/test-envs/docker-compose-2.7-mysql.yml @@ -0,0 +1,29 @@ +version: '3' +services: + db: + image: mysql:5.7 + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: 1 + MYSQL_DATABASE: ${TRACKS_DB:-tracks} + volumes: + - db-data:/var/lib/mysql + web: + build: + context: .. + dockerfile: Dockerfile-2.7 + environment: + # These are set in script/ci-build, so we need to pass-thru them. + RAILS_ENV: $RAILS_ENV + DATABASE_NAME: $DATABASE_NAME + DATABASE_USERNAME: root + DATABASE_PASSWORD_EMPTY: 1 + volumes: + - ${VOLUME:-..}:/app:Z + - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z + - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z + ports: + - 3000:3000 + depends_on: + - db +volumes: + db-data: From a7661eb33aed90c0f04155b98070ba72b8250dc6 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 31 Aug 2020 21:38:16 +0300 Subject: [PATCH 171/767] Update SECURITY.md --- SECURITY.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 983f5d2c..2eba0a1b 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -9,6 +9,13 @@ ## Reporting a Vulnerability -Please report any security issues via email to security@getontracks.org. If you don't get a reply for your email, resend the email after one week. If there's still no reply, open an issue in the issue queue but *do not disclose the details* in the issue, only ask about the reply and status. +Please report any security issues via email to security@getontracks.org. +If you don't get a reply for your email, resend the email after one week. +If there's still no reply, open an issue in the issue queue but *do not +disclose the details* in the issue, only ask about the reply and status. -Unfortunately Tracks is not part of a bug bounty program, but we do provide appropriate credits for disclosing security issues. +You can (and should) encrypt the email you send with OpenGPG key +0x8af45b6854414d2d, which you can find for example in pool.sks-keyservers.net. + +Unfortunately Tracks is not part of a bug bounty program, but we do provide +appropriate credits for disclosing security issues. From 858ce1b0d3358e8c20399f519511975b8daf2b52 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 1 Sep 2020 14:34:57 +0300 Subject: [PATCH 172/767] #2468: Fix the recurring todo dialog UI bug. This probably shouldn't be necessary, but I couldn't quickly figured out what had changed for the dialog to behave incorrectly. Seems to work. Fixes #2468. --- app/assets/stylesheets/include/legacy.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/include/legacy.scss b/app/assets/stylesheets/include/legacy.scss index c3a8bf9c..bfc3052c 100644 --- a/app/assets/stylesheets/include/legacy.scss +++ b/app/assets/stylesheets/include/legacy.scss @@ -1384,3 +1384,7 @@ ul.todo-submenu > li > a { background: image-url('to_project_off.png') no-repeat; } } + +.recurring_todos .ui-dialog .ui-dialog-title { + float: inherit; +} From 3ee8237029785833ae854861e640e09842a2cb31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 05:51:27 +0000 Subject: [PATCH 173/767] Bump rubocop from 0.89.1 to 0.90.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.89.1 to 0.90.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.89.1...v0.90.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8883213e..30aceb1a 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem "rubocop", "~> 0.89", require: false + gem "rubocop", "~> 0.90", require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 1892e92c..91f7eb9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,7 +218,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.89.1) + rubocop (0.90.0) parallel (~> 1.10) parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) @@ -333,7 +333,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 0.89) + rubocop (~> 0.90) sanitize (~> 5.2) sassc-rails (~> 2.1.2) selenium-webdriver (~> 3.142) From 4b4897585f6fa8c7ff7c41bf6bb958c59d1cafe0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2020 05:35:31 +0000 Subject: [PATCH 174/767] Bump bcrypt from 3.1.15 to 3.1.16 Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.15 to 3.1.16. - [Release notes](https://github.com/codahale/bcrypt-ruby/releases) - [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG) - [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.15...v3.1.16) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 30aceb1a..44a936ab 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem 'puma', '~> 4.3' gem 'paperclip' # To use ActiveModel has_secure_password -gem 'bcrypt', '~> 3.1.15' +gem 'bcrypt', '~> 3.1.16' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' diff --git a/Gemfile.lock b/Gemfile.lock index 91f7eb9e..765a3e61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM autoprefixer-rails (9.4.7) execjs backport (1.1.2) - bcrypt (3.1.15) + bcrypt (3.1.16) benchmark (0.1.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) @@ -308,7 +308,7 @@ DEPENDENCIES actionpack-xml_parser (~> 2.0) activemodel-serializers-xml (~> 1.0.1) acts_as_list - bcrypt (~> 3.1.15) + bcrypt (~> 3.1.16) bootstrap-sass (= 3.4.1) bullet byebug From bbb9fc8809eb86311beeda3112f175eca7cb2b6d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 5 Sep 2020 01:24:23 +0300 Subject: [PATCH 175/767] Make LIKE searches case-insensitive also on PgSQL --- app/controllers/todos_controller.rb | 2 +- app/models/context.rb | 2 +- app/models/note.rb | 2 +- app/models/project.rb | 4 ++-- app/models/search/search_results.rb | 6 +++--- lib/common.rb | 10 ++++++++++ test/controllers/search_controller_test.rb | 6 +++--- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 82437157..99789289 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -766,7 +766,7 @@ class TodosController < ApplicationController def get_not_completed_for_predecessor(relation, todo_id=nil) items = relation.todos.not_completed. - where('(LOWER(todos.description) LIKE ?)', "%#{params[:term].downcase}%") + where('(LOWER(todos.description) ' + Common.like_operator + '?)', "%#{params[:term].downcase}%") items = items.where("AND NOT(todos.id=?)", todo_id) unless todo_id.nil? items. diff --git a/app/models/context.rb b/app/models/context.rb index 2eaad6fb..7461e730 100644 --- a/app/models/context.rb +++ b/app/models/context.rb @@ -7,7 +7,7 @@ class Context < ApplicationRecord scope :active, -> { where state: :active } scope :hidden, -> { where state: :hidden } scope :closed, -> { where state: :closed } - scope :with_name, lambda { |name| where("name LIKE ?", name) } + scope :with_name, lambda { |name| where("name " + Common.like_operator + " ?", name) } acts_as_list :scope => :user, :top_of_list => 0 diff --git a/app/models/note.rb b/app/models/note.rb index 5ba0750a..dc23a535 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -2,5 +2,5 @@ class Note < ApplicationRecord belongs_to :user belongs_to :project - scope :with_body, lambda { |terms| where("body LIKE ?", terms) } + scope :with_body, lambda { |terms| where("body " + Common.like_operator + " ?", terms) } end diff --git a/app/models/project.rb b/app/models/project.rb index c7e62a85..675cbb45 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -11,8 +11,8 @@ class Project < ApplicationRecord scope :completed, -> { where state: 'completed' } scope :uncompleted, -> { where("NOT(state = ?)", 'completed') } - scope :with_name_or_description, lambda { |body| where("name LIKE ? OR description LIKE ?", body, body) } - scope :with_namepart, lambda { |body| where("name LIKE ?", body + '%') } + scope :with_name_or_description, lambda { |body| where("name " + Common.like_operator + " ? OR description " + Common.like_operator + " ?", body, body) } + scope :with_namepart, lambda { |body| where("name " + Common.like_operator + " ?", body + '%') } before_create :set_last_reviewed_now diff --git a/app/models/search/search_results.rb b/app/models/search/search_results.rb index 36130db3..73463656 100644 --- a/app/models/search/search_results.rb +++ b/app/models/search/search_results.rb @@ -27,14 +27,14 @@ module Search def incomplete_todos(terms) @user.todos. - where("(todos.description LIKE ? OR todos.notes LIKE ?) AND todos.completed_at IS NULL", terms, terms). + where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND todos.completed_at IS NULL", terms, terms). includes(Todo::DEFAULT_INCLUDES). reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) end def complete_todos(terms) @user.todos. - where("(todos.description LIKE ? OR todos.notes LIKE ?) AND NOT (todos.completed_at IS NULL)", terms, terms). + where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND NOT (todos.completed_at IS NULL)", terms, terms). includes(Todo::DEFAULT_INCLUDES). reorder("todos.completed_at DESC") end @@ -46,7 +46,7 @@ module Search "LEFT JOIN taggings ON tags.id = taggings.tag_id "+ "LEFT JOIN todos ON taggings.taggable_id = todos.id "+ "WHERE todos.user_id=? "+ - "AND tags.name LIKE ? ", @user.id, terms]) + "AND tags.name " + Common.like_operator + " ? ", @user.id, terms]) end end diff --git a/lib/common.rb b/lib/common.rb index 240fa8f0..83105ed6 100644 --- a/lib/common.rb +++ b/lib/common.rb @@ -6,4 +6,14 @@ module Common @user_theme = SITE_CONFIG['default_theme'] || 'light_blue' end end + + def self.like_operator + # This is something of a hack to use the correct operator for Pg + if ActiveRecord::Base.connection.adapter_name.downcase.to_sym == :postgresql + like = 'ILIKE' + else + like = 'LIKE' + end + return like + end end diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb index 06a0d8ed..e67eaa2c 100644 --- a/test/controllers/search_controller_test.rb +++ b/test/controllers/search_controller_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class SearchControllerTest < ActionController::TestCase - + def setup end @@ -10,12 +10,12 @@ class SearchControllerTest < ActionController::TestCase get :index assert_response 200 end - + def test_search_for_todo_with_tag login_as :admin_user post :results, params: { :search => "gates" } assert_response 200 assert_equal 3, assigns['count'], "should have found 3 todos" end - + end From 41c9d3fb1871d583bf2861d306120770a51fb256 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 5 Sep 2020 02:40:26 +0300 Subject: [PATCH 176/767] Sort the group count values to fix tests in PgSQL broken by 5b6cbf566. --- test/models/user_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 607a0ff1..447e5179 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -364,16 +364,16 @@ class UserTest < ActiveSupport::TestCase # test group counts for projects and contexts project_counts = u.todos.count_by_group(:project_id) - assert_equal [6,3,4,4], project_counts.values + assert_equal [6,3,4,4].sort, project_counts.values.sort context_counts = u.todos.count_by_group(:context_id) - assert_equal [7,3,1,3,1,2], context_counts.values + assert_equal [7,3,1,3,1,2].sort, context_counts.values.sort # add a todo to the first context and check that the count is increased u.todos.create!(:description => "yet another todo", :context => u.contexts.first) context_counts = u.todos.reload.count_by_group(:context_id) - assert_equal [8,3,1,3,1,2], context_counts.values + assert_equal [8,3,1,3,1,2].sort, context_counts.values.sort end def test_deleting_user_deletes_all_related_data From de25e989db2957f00d15f0a6a91fc252beb214ec Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 5 Sep 2020 03:51:50 +0300 Subject: [PATCH 177/767] Fix the last test failing on PgSQL by making sure we're editing an active todo when testing notes --- test/controllers/todos_controller_test.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index 70983854..3fa3b774 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -480,7 +480,6 @@ class TodosControllerTest < ActionController::TestCase login_as(:admin_user) get :index, params: { :format => "rss" } assert_equal 'application/rss+xml', @response.media_type - # puts @response.body assert_select 'rss[version="2.0"]' do assert_select 'channel' do @@ -996,7 +995,7 @@ class TodosControllerTest < ActionController::TestCase def test_format_note login_as(:admin_user) - todo = users(:admin_user).todos.first + todo = users(:admin_user).todos.where("state='active'").first todo.notes = "Normal *bold* http://foo.bar/baz" todo.save! get :index From 294a6356fab3a3e681454d5ad9a7018cd4b2b343 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 6 Sep 2020 02:00:11 +0300 Subject: [PATCH 178/767] #2471: Add test to find similar problems in future --- test/controllers/todos_controller_test.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index 3fa3b774..79eac5a6 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -223,14 +223,15 @@ class TodosControllerTest < ActionController::TestCase login_as(:admin_user) assert_difference 'Todo.count' do put :create, xhr: true, params: { - "context_name"=>"library", - "project_name"=>"Build a working time machine", + "context_name" => "library", + "project_name" => "Build a working time machine", "todo" => { - "notes"=>"", + "notes" => "", "description" => "Call Warren Buffet to find out how much he makes per day", - "due"=>"30/11/2006" + "due" => "30/11/2006" }, - "tag_list"=>"foo bar" + "_source_view" => "context", + "tag_list" => "foo bar" } assert_response 200 end From e3b064638c430daaa829770bb6e01115047d0873 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 6 Sep 2020 02:25:22 +0300 Subject: [PATCH 179/767] #2471: Fix a syntax error probably caused by c66ce02cb when @original_item is nil --- app/controllers/todos_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 99789289..aa629cda 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -309,7 +309,7 @@ class TodosController < ApplicationController @source_view = params['_source_view'] || 'todo' # Create a (unsaved) copy of the original todo, before it was toggled - @original_item = current_user.todos.build(@todo.attributes) + @original_item = current_user.todos.build(@todo.attributes) @original_completed_period = DoneTodos.completed_period(@todo.completed_at) @todo_was_completed_from_deferred_or_blocked_state = @@ -940,7 +940,7 @@ end @down_count = current_user.todos.active.not_hidden.count end from.context do - context_id = @original_item.context_id || @todo.context_id + context_id = @original_item ? @original_item.context_id || @todo.context_id : @todo.context_id todos = current_user.contexts.find(context_id).todos.not_completed if @todo.context.hidden? From beed8773e66fb2d29bc0de45b87cd6832e496154 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 6 Sep 2020 02:44:35 +0300 Subject: [PATCH 180/767] Add the remaining necessary parameters to the test --- test/controllers/todos_controller_test.rb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index 79eac5a6..509ea9f5 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -230,13 +230,31 @@ class TodosControllerTest < ActionController::TestCase "description" => "Call Warren Buffet to find out how much he makes per day", "due" => "30/11/2006" }, - "_source_view" => "context", "tag_list" => "foo bar" } assert_response 200 end end + def test_create_todo_via_xhr_context_view + login_as(:admin_user) + assert_difference 'Todo.count' do + put :create, xhr: true, params: { + "context_name" => "library", + "project_name" => "", + "todo" => { + "notes" => "", + "description" => "Read Warren Buffet's book", + "due" => "30/12/2006" + }, + "_source_view" => "context", + "default_context_name" => "library", + "tag_list" => "bar foo" + } + assert_response 200 + end + end + def test_fail_to_create_todo_via_xml login_as(:admin_user) # try to create with no context, which is not valid From 27f7fca29ef9adbd8902aec151a3bf997caf2f79 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 6 Sep 2020 04:27:57 +0300 Subject: [PATCH 181/767] #2472: Add test to find similar problems in future --- test/controllers/todos_controller_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index 509ea9f5..a419492b 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -440,6 +440,14 @@ class TodosControllerTest < ActionController::TestCase assert_equal context.id, todo.reload.context.id, 'context of todo should be changed' end + def test_update_todo_due_in_calendar_view + t = Todo.find(1) + login_as(:admin_user) + post :update, xhr: true, params: { :id => 1, :_source_view => 'calendar', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"id"=>"1", "notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"31/11/2006"}, "tag_list"=>"foo bar" } + t = Todo.find(1) + assert_response 200 + end + ####### # defer ####### From abad8c77ee0bbb4346c40b9a4f4b8c4673f0c5e7 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 6 Sep 2020 14:06:57 +0300 Subject: [PATCH 182/767] =?UTF-8?q?#2472:=20Fix=20fetching=20calendar=20ID?= =?UTF-8?q?=20on=20task=20update.=20Didn't=20figure=20out=20when=20this=20?= =?UTF-8?q?has=20been=20broken=20=E2=80=93=20could=20be=20c66ce02cb,=20but?= =?UTF-8?q?=20not=20sure=20how.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/todos_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index aa629cda..776f92f9 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -423,6 +423,7 @@ class TodosController < ApplicationController @todo = current_user.todos.find(params['id']) @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo + @original_item_due_id = get_due_id_for_calendar(@original_item.due) update_tags update_project @@ -442,7 +443,6 @@ class TodosController < ApplicationController @saved = false end - provide_project_or_context_for_view # this is set after save and cleared after reload, so save it here @@ -1138,18 +1138,18 @@ end end def count_old_due_empty(id) - due_today_date = Time.zone.now - due_this_week_date = Time.zone.now.end_of_week - due_next_week_date = due_this_week_date + 7.days - due_this_month_date = Time.zone.now.end_of_month case id when "due_today" + due_today_date = Time.zone.now return current_user.todos.not_completed.where('todos.due <= ?', due_today_date).count when "due_this_week" + due_this_week_date = Time.zone.now.end_of_week return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_today_date, due_this_week_date).count when "due_next_week" + due_next_week_date = due_this_week_date + 7.days return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_this_week_date, due_next_week_date).count when "due_this_month" + due_this_month_date = Time.zone.now.end_of_month return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_next_week_date, due_this_month_date).count when "due_after_this_month" return current_user.todos.not_completed.where('todos.due > ?', due_this_month_date).count From 30f293208a2c562aafda3a1a5104bfa0e8f1b4cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2020 05:26:57 +0000 Subject: [PATCH 183/767] Bump puma from 4.3.5 to 4.3.6 Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.5...v4.3.6) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d3f5f758..34cb3cc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,7 +166,7 @@ GEM parser (2.7.1.4) ast (~> 2.4.1) pg (1.2.3) - puma (4.3.5) + puma (4.3.6) nio4r (~> 2.0) rack (2.2.3) rack-mini-profiler (2.0.4) From 773a77bf21e8097e7cfde7d291cb4350849b2eb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 05:20:41 +0000 Subject: [PATCH 184/767] Bump rails from 6.0.3.2 to 6.0.3.3 Bumps [rails](https://github.com/rails/rails) from 6.0.3.2 to 6.0.3.3. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.0.3.2...v6.0.3.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 106 +++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 34cb3cc4..b51d5d49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,26 +11,26 @@ GEM RedCloth (4.3.2) aasm (5.1.1) concurrent-ruby (~> 1.0) - actioncable (6.0.3.2) - actionpack (= 6.0.3.2) + actioncable (6.0.3.3) + actionpack (= 6.0.3.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.2) - actionpack (= 6.0.3.2) - activejob (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + actionmailbox (6.0.3.3) + actionpack (= 6.0.3.3) + activejob (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) mail (>= 2.7.1) - actionmailer (6.0.3.2) - actionpack (= 6.0.3.2) - actionview (= 6.0.3.2) - activejob (= 6.0.3.2) + actionmailer (6.0.3.3) + actionpack (= 6.0.3.3) + actionview (= 6.0.3.3) + activejob (= 6.0.3.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.2) - actionview (= 6.0.3.2) - activesupport (= 6.0.3.2) + actionpack (6.0.3.3) + actionview (= 6.0.3.3) + activesupport (= 6.0.3.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -38,36 +38,36 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.0.3.2) - actionpack (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + actiontext (6.0.3.3) + actionpack (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) nokogiri (>= 1.8.5) - actionview (6.0.3.2) - activesupport (= 6.0.3.2) + actionview (6.0.3.3) + activesupport (= 6.0.3.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.2) - activesupport (= 6.0.3.2) + activejob (6.0.3.3) + activesupport (= 6.0.3.3) globalid (>= 0.3.6) - activemodel (6.0.3.2) - activesupport (= 6.0.3.2) + activemodel (6.0.3.3) + activesupport (= 6.0.3.3) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.3.2) - activemodel (= 6.0.3.2) - activesupport (= 6.0.3.2) - activestorage (6.0.3.2) - actionpack (= 6.0.3.2) - activejob (= 6.0.3.2) - activerecord (= 6.0.3.2) + activerecord (6.0.3.3) + activemodel (= 6.0.3.3) + activesupport (= 6.0.3.3) + activestorage (6.0.3.3) + actionpack (= 6.0.3.3) + activejob (= 6.0.3.3) + activerecord (= 6.0.3.3) marcel (~> 0.3.1) - activesupport (6.0.3.2) + activesupport (6.0.3.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -132,7 +132,7 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.6.0) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -147,11 +147,11 @@ GEM mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) minitest-stub-const (0.6) mocha (1.11.2) mysql2 (0.5.3) - nio4r (2.5.2) + nio4r (2.5.3) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) @@ -173,20 +173,20 @@ GEM rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.2) - actioncable (= 6.0.3.2) - actionmailbox (= 6.0.3.2) - actionmailer (= 6.0.3.2) - actionpack (= 6.0.3.2) - actiontext (= 6.0.3.2) - actionview (= 6.0.3.2) - activejob (= 6.0.3.2) - activemodel (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + rails (6.0.3.3) + actioncable (= 6.0.3.3) + actionmailbox (= 6.0.3.3) + actionmailer (= 6.0.3.3) + actionpack (= 6.0.3.3) + actiontext (= 6.0.3.3) + actionview (= 6.0.3.3) + activejob (= 6.0.3.3) + activemodel (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) bundler (>= 1.3.0) - railties (= 6.0.3.2) + railties (= 6.0.3.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -199,9 +199,9 @@ GEM loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) - railties (6.0.3.2) - actionpack (= 6.0.3.2) - activesupport (= 6.0.3.2) + railties (6.0.3.3) + actionpack (= 6.0.3.3) + activesupport (= 6.0.3.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) From e99ef540742ca15062c3564a6dafd255ca3dbe28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Sep 2020 05:50:59 +0000 Subject: [PATCH 185/767] Bump acts_as_list from 1.0.1 to 1.0.2 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/brendon/acts_as_list/releases) - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.0.1...v1.0.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b51d5d49..357f759d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts_as_list (1.0.1) + acts_as_list (1.0.2) activerecord (>= 4.2) ast (2.4.1) autoprefixer-rails (9.4.7) From 1bea7e5871971a310e1cddbc6a8efd188a01c7ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 05:32:17 +0000 Subject: [PATCH 186/767] Bump rubocop from 0.90.0 to 0.91.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.90.0 to 0.91.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.90.0...v0.91.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 458a782a..515733c8 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem "rubocop", "~> 0.90", require: false + gem "rubocop", "~> 0.91", require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 357f759d..702407d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,16 +219,16 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.90.0) + rubocop (0.91.0) parallel (~> 1.10) parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.3.0, < 1.0) + rubocop-ast (>= 0.4.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.3.0) + rubocop-ast (0.4.0) parser (>= 2.7.1.4) ruby-progressbar (1.10.1) rubyzip (2.0.0) @@ -335,7 +335,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 0.90) + rubocop (~> 0.91) sanitize (~> 5.2) sassc-rails (~> 2.1.2) selenium-webdriver (~> 3.142) From 34d0ecc7fb3f1111a9c3a3299de5012d666bdbbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2020 05:27:58 +0000 Subject: [PATCH 187/767] Bump rack-mini-profiler from 2.0.4 to 2.1.0 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.0.4 to 2.1.0. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.4...v2.1.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 702407d2..98b739ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,7 +169,7 @@ GEM puma (4.3.6) nio4r (~> 2.0) rack (2.2.3) - rack-mini-profiler (2.0.4) + rack-mini-profiler (2.1.0) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) From 01223eb9ec0ee4fa6ecfd99bfe6d756fe3291c38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 05:30:56 +0000 Subject: [PATCH 188/767] Bump puma from 4.3.6 to 5.0.0 Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.6...v5.0.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 515733c8..15f801bf 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem "acts_as_list" gem "aasm", '~> 5.1.1' gem "htmlentities" gem "rails_autolink" -gem 'puma', '~> 4.3' +gem 'puma', '~> 5.0' gem 'paperclip' # To use ActiveModel has_secure_password diff --git a/Gemfile.lock b/Gemfile.lock index 98b739ba..b4ad3fdd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,7 +151,7 @@ GEM minitest-stub-const (0.6) mocha (1.11.2) mysql2 (0.5.3) - nio4r (2.5.3) + nio4r (2.5.4) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) @@ -166,7 +166,7 @@ GEM parser (2.7.1.4) ast (~> 2.4.1) pg (1.2.3) - puma (4.3.6) + puma (5.0.0) nio4r (~> 2.0) rack (2.2.3) rack-mini-profiler (2.1.0) @@ -328,7 +328,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 4.3) + puma (~> 5.0) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing From d706c080e7f11d86804a4f54b61e6864f22e760d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 19 Sep 2020 11:27:25 +0300 Subject: [PATCH 189/767] #2486: Change Gitter to Matrix Fixes #2486. --- README.md | 3 +-- app/views/integrations/help.html.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c4cb75e7..753197c7 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ * Bug reports and feature requests: https://github.com/TracksApp/tracks/issues * Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki * Mailing list: http://groups.google.com/group/TracksApp -* IRC channel: #tracks on Freenode -* Gitter: https://gitter.im/TracksApp/tracks +* IRC channel: #tracks on Freenode, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org) * Original developer: bsag (http://www.rousette.org.uk/) * Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by Ardcoras oy, https://www.ardcoras.fi/) * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors diff --git a/app/views/integrations/help.html.erb b/app/views/integrations/help.html.erb index 5cd0fca6..3ae78ec7 100644 --- a/app/views/integrations/help.html.erb +++ b/app/views/integrations/help.html.erb @@ -8,6 +8,6 @@ From e474ee564ae3648cfb5ea2c536c6f60856f96718 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 23 Sep 2020 13:10:38 +0300 Subject: [PATCH 190/767] More fixes to README --- README.md | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 753197c7..7209fb52 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,34 @@ -# Tracks: a GTD(TM) web application, built with Ruby on Rails +# Tracks: a GTD™ compatible web application built with Ruby on Rails [![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions) [![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks) +## About + * Project homepage: http://www.getontracks.org/ * Manual: http://www.getontracks.org/manual/ * Source at GitHub: https://github.com/TracksApp/tracks +* Hosted services: https://github.com/TracksApp/tracks/wiki/Hosted-Tracks * Bug reports and feature requests: https://github.com/TracksApp/tracks/issues -* Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki * Mailing list: http://groups.google.com/group/TracksApp * IRC channel: #tracks on Freenode, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org) -* Original developer: bsag (http://www.rousette.org.uk/) -* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by Ardcoras oy, https://www.ardcoras.fi/) -* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors * License: See COPYING Full instructions for both new installations and upgrades from older installations of Tracks can be found in the [wiki](https://github.com/TracksApp/tracks/wiki/Installation). -If you are thinking about contributing towards the development of Tracks, -please read /CONTRIBUTING.md for general information. Also you can find -some information on development, testing and contributing on the wiki. - As always, make sure that you take sensible precautions and back up all your data frequently, taking particular care when you are upgrading. Enjoy being productive! + +## Contributors and consulting + +* Original developer: bsag (http://www.rousette.org.uk/) +* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) + (sponsored by Ardcoras oy, https://www.ardcoras.fi/). +* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors + +If you are thinking about contributing towards the development of Tracks, +please read /CONTRIBUTING.md for general information. Also you can find +some information on development, testing and contributing on the wiki. From 9b27b08856edb1b59751996f350c2d62b3371d71 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 23 Sep 2020 13:12:18 +0300 Subject: [PATCH 191/767] #2486: Fix the syntax and move Matrix together with IRC --- README.md | 2 +- app/views/integrations/help.html.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7209fb52..11d9dbc2 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Enjoy being productive! * Original developer: bsag (http://www.rousette.org.uk/) * Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) - (sponsored by Ardcoras oy, https://www.ardcoras.fi/). + (sponsored by [Ardcoras oy](https://www.ardcoras.fi/), also available for paid consulting) * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors If you are thinking about contributing towards the development of Tracks, diff --git a/app/views/integrations/help.html.erb b/app/views/integrations/help.html.erb index 3ae78ec7..7402f854 100644 --- a/app/views/integrations/help.html.erb +++ b/app/views/integrations/help.html.erb @@ -8,6 +8,5 @@ From 32feff00042b49fc0dc6ff679f45b4ae0f2973d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 05:50:47 +0000 Subject: [PATCH 192/767] Bump rubocop from 0.91.0 to 0.91.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.91.0 to 0.91.1. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.91.0...v0.91.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b4ad3fdd..2e35c64a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (1.7.1) + regexp_parser (1.8.0) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -219,7 +219,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.91.0) + rubocop (0.91.1) parallel (~> 1.10) parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) @@ -228,7 +228,7 @@ GEM rubocop-ast (>= 0.4.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.4.0) + rubocop-ast (0.4.2) parser (>= 2.7.1.4) ruby-progressbar (1.10.1) rubyzip (2.0.0) From 5fc1fec18af614c2d946cc4f9a9984942062ac37 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 23 Sep 2020 22:44:18 +0300 Subject: [PATCH 193/767] Add security policy --- SECURITY.md | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 2eba0a1b..4b190778 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,13 +1,13 @@ -# Security Policy +# Security policy -## Supported Versions +## Supported versions | Version | Supported | | ------- | ------------------ | | 2.4.x | :white_check_mark: | | <2.4.x | :x: | -## Reporting a Vulnerability +## Reporting a vulnerability Please report any security issues via email to security@getontracks.org. If you don't get a reply for your email, resend the email after one week. @@ -19,3 +19,45 @@ You can (and should) encrypt the email you send with OpenGPG key Unfortunately Tracks is not part of a bug bounty program, but we do provide appropriate credits for disclosing security issues. + +## Evaluating and fixing a vulnerability + +When a security vulnerability is reported to the maintainers, the +maintainers first validate the vulnerability and preliminarily estimate +the risk caused by the vulnerability. + +Any security issue is kept strictly confidential until a fix is made and +validated by the maintainers and, if necessary, the reporter. Any fixes +are not committed to the public repository before publishing. + +When a fix has been validated, the final risk assessment of the issue is +done based on the latest version of the CVSS system and the criteria below. + +## Security advisories + +A security advisory is a public announcement managed by the maintainers +which informs instance maintainers about a security problem in the software +and the steps instance maintainers should take to address it. On release it +is published widely so that instance maintainers can address it quickly. + +If necessary, the maintainers can decide to issue a pre-announcement +informing the instance maintainers of an upcoming security advisory. This +is done when timely addressing of the vulnerability is very important due +to the high risk caused by it. + +Security advisories are published for security vulnerabilities that + +* Are caused by code included in the software repository (not any libraries + or other code not itself in the repository), +* Exist in stable or release candidate releases (not alpha or beta + releases or unreleased code), +* Are exploitable either without logging in or without admin privileges, and +* Affect either the whole instance or other users than the one running the + exploit. + +## Other vulnerabilities + +If the vulnerability does not warrant a security advisory, the vulnerability +is fixed and released with a note in the release notes of the release. +Details of the vulnerability as well as the risk assessment and grounds for +not publishing a security advisory are included. From 5e5715d9de2b5df18977950ccf2ac1deede420b8 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 24 Sep 2020 12:28:57 +0300 Subject: [PATCH 194/767] Version 2.5.1 --- SECURITY.md | 5 +---- config/initializers/tracks.rb | 2 +- doc/CHANGELOG.md | 25 +++++++++++++++++++++++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 2eba0a1b..9e936594 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,10 +2,7 @@ ## Supported Versions -| Version | Supported | -| ------- | ------------------ | -| 2.4.x | :white_check_mark: | -| <2.4.x | :x: | +Only the most recent stable version is supported. ## Reporting a Vulnerability diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb index b7b99dcc..4acabf49 100644 --- a/config/initializers/tracks.rb +++ b/config/initializers/tracks.rb @@ -1,4 +1,4 @@ -tracks_version='2.5.0' +tracks_version='2.5.1' # comment out next two lines if you do not want (or can not) the date of the # last git commit in the footer info=`git log --pretty=format:"%ai" -1` diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 657cf54a..9a0c50a5 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,7 +1,28 @@ -## Version 2.5.0 - See doc/upgrading.md for the upgrade documentation! +## Version 2.5.1 + +### Security issue disclosure + +Joe Thorpe from Secarma disclosed an XSS issue that was inadvertently +fixed in 2.5.0 by another bug fix. Tracks previously rendered XSS content +in the user's own data. The content is only shown to the user themself, +which mitigates the vulnerability in the normal use case where a single +user account is only used by one person. The CVSS rating for self-XSS is +debatable and thus is not published for this issue. + +I want to thank Joe for reporting the issue and for the insightful discussion +regarding the issue. Thanks to the disclosure there is now also a written +security policy for the project. + +### Bug fixes + +* Editing a due date in the calendar view fixed +* Adding actions in the context view fixed +* Fixed the recurring todo UI + +## Version 2.5.0 + ### New features * Updated documentation both in the doc directory and online. * .skip-docker file has been replaced with .use-docker, see upgrading.md for From afe1c03f20ac074051381921bde0aac871e1b0d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2020 06:28:28 +0000 Subject: [PATCH 195/767] Bump solargraph from 0.39.15 to 0.39.16 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.39.15 to 0.39.16. - [Release notes](https://github.com/castwide/solargraph/releases) - [Commits](https://github.com/castwide/solargraph/compare/v0.39.15...v0.39.16) Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2e35c64a..8d26994d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.19.2) - parser (2.7.1.4) + parser (2.7.1.5) ast (~> 2.4.1) pg (1.2.3) puma (5.0.0) @@ -228,8 +228,9 @@ GEM rubocop-ast (>= 0.4.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.4.2) - parser (>= 2.7.1.4) + rubocop-ast (0.7.0) + parser (>= 2.7.1.5) + strscan (>= 1.0.0) ruby-progressbar (1.10.1) rubyzip (2.0.0) safe_yaml (1.0.5) @@ -252,7 +253,7 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) - solargraph (0.39.15) + solargraph (0.39.16) backport (~> 1.1) benchmark bundler (>= 1.17.2) @@ -275,6 +276,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) + strscan (1.0.3) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) From 302e71777e1103f8d623c10dd32f1479f70c320b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2020 06:28:44 +0000 Subject: [PATCH 196/767] Bump rubocop from 0.91.1 to 0.92.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.91.1 to 0.92.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.91.1...v0.92.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 15f801bf..0def0946 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem "rubocop", "~> 0.91", require: false + gem "rubocop", "~> 0.92", require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 2e35c64a..674608fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.19.2) - parser (2.7.1.4) + parser (2.7.1.5) ast (~> 2.4.1) pg (1.2.3) puma (5.0.0) @@ -219,17 +219,18 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.91.1) + rubocop (0.92.0) parallel (~> 1.10) - parser (>= 2.7.1.1) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.4.0, < 1.0) + rubocop-ast (>= 0.5.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.4.2) - parser (>= 2.7.1.4) + rubocop-ast (0.7.0) + parser (>= 2.7.1.5) + strscan (>= 1.0.0) ruby-progressbar (1.10.1) rubyzip (2.0.0) safe_yaml (1.0.5) @@ -275,6 +276,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) + strscan (1.0.3) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) @@ -335,7 +337,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 0.91) + rubocop (~> 0.92) sanitize (~> 5.2) sassc-rails (~> 2.1.2) selenium-webdriver (~> 3.142) From 0eb6be27530fcede106aff25534a3e736b075d59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Sep 2020 05:48:37 +0000 Subject: [PATCH 197/767] Bump puma from 5.0.0 to 5.0.2 Bumps [puma](https://github.com/puma/puma) from 5.0.0 to 5.0.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.0.0...v5.0.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e46e6b5d..16dfae46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,7 +166,7 @@ GEM parser (2.7.1.5) ast (~> 2.4.1) pg (1.2.3) - puma (5.0.0) + puma (5.0.2) nio4r (~> 2.0) rack (2.2.3) rack-mini-profiler (2.1.0) From e300a3993117b75008d461407325f297127aa40b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Sep 2020 05:48:47 +0000 Subject: [PATCH 198/767] Bump solargraph from 0.39.16 to 0.39.17 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.39.16 to 0.39.17. - [Release notes](https://github.com/castwide/solargraph/releases) - [Commits](https://github.com/castwide/solargraph/compare/v0.39.16...v0.39.17) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e46e6b5d..be512628 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (1.8.0) + regexp_parser (1.8.1) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -228,9 +228,8 @@ GEM rubocop-ast (>= 0.5.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.7.0) + rubocop-ast (0.7.1) parser (>= 2.7.1.5) - strscan (>= 1.0.0) ruby-progressbar (1.10.1) rubyzip (2.0.0) safe_yaml (1.0.5) @@ -253,7 +252,7 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) - solargraph (0.39.16) + solargraph (0.39.17) backport (~> 1.1) benchmark bundler (>= 1.17.2) @@ -276,7 +275,6 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - strscan (1.0.3) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) From 4924fa19ad5a5abf7aa0ed3b5dd8d5a63d64531d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 05:50:03 +0000 Subject: [PATCH 199/767] Bump rails from 6.0.3.3 to 6.0.3.4 Bumps [rails](https://github.com/rails/rails) from 6.0.3.3 to 6.0.3.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.0.3.3...v6.0.3.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fedf16e7..f7b5e27d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,26 +11,26 @@ GEM RedCloth (4.3.2) aasm (5.1.1) concurrent-ruby (~> 1.0) - actioncable (6.0.3.3) - actionpack (= 6.0.3.3) + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) mail (>= 2.7.1) - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -38,36 +38,36 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.0.3.3) - actionpack (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) nokogiri (>= 1.8.5) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) - activestorage (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) marcel (~> 0.3.1) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -173,20 +173,20 @@ GEM rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.3) - actioncable (= 6.0.3.3) - actionmailbox (= 6.0.3.3) - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actiontext (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) bundler (>= 1.3.0) - railties (= 6.0.3.3) + railties (= 6.0.3.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -199,9 +199,9 @@ GEM loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) - railties (6.0.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -270,7 +270,7 @@ GEM sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) From 07537c39e723390a24f2f8dd862c37c3a43a6e09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2020 05:55:13 +0000 Subject: [PATCH 200/767] Bump rubocop from 0.92.0 to 0.93.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.92.0 to 0.93.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.92.0...v0.93.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 0def0946..c282b2a9 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem "rubocop", "~> 0.92", require: false + gem "rubocop", "~> 0.93", require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index f7b5e27d..079e5dd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.19.2) - parser (2.7.1.5) + parser (2.7.2.0) ast (~> 2.4.1) pg (1.2.3) puma (5.0.2) @@ -219,13 +219,13 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.92.0) + rubocop (0.93.0) parallel (~> 1.10) parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) + regexp_parser (>= 1.8) rexml - rubocop-ast (>= 0.5.0) + rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.7.1) @@ -335,7 +335,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 0.92) + rubocop (~> 0.93) sanitize (~> 5.2) sassc-rails (~> 2.1.2) selenium-webdriver (~> 3.142) From 5ef41072dda383776a02bc7d048a52ec69b72f35 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 25 Sep 2020 01:15:14 +0300 Subject: [PATCH 201/767] Add Finnish locale --- config/locales/fi.yml | 1037 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1037 insertions(+) create mode 100644 config/locales/fi.yml diff --git a/config/locales/fi.yml b/config/locales/fi.yml new file mode 100644 index 00000000..5eb1b9d8 --- /dev/null +++ b/config/locales/fi.yml @@ -0,0 +1,1037 @@ +--- +fi: + number: + format: + separator: "," + precision: 3 + delimiter: " " + human: + format: + precision: 1 + delimiter: "" + storage_units: + format: "%n %u" + units: + kb: kt + tb: Tt + gb: Gt + byte: + one: Tavu + other: Tavua + mb: Mt + percentage: + format: + delimiter: "" + currency: + format: + format: "%u%n" + unit: € + separator: "," + precision: 2 + delimiter: " " + precision: + format: + delimiter: "" + activerecord: + attributes: + project: + name: Nimi + default_tags: Oletustagit + default_context_name: Oletuskonteksti + description: Kuvaus + todo: + predecessors: Riippuu + show_from: Näytä alkaen + notes: Muistiinpanot + project: Projekti + context: Konteksti + description: Kuvaus + due: Määräpäivä + tags: Tagit + user: + auth_type: Kirjautumistyyppi + display_name: Näyttönimi + first_name: Etunimi + last_name: Sukunimi + login: Login + open_id_url: OpenID-URL + password: Salasana + preference: + show_hidden_projects_in_sidebar: Näytä piilotetut projektit sivupalkissa + date_format: Päivämäärämuoto + show_hidden_contexts_in_sidebar: Näytä piilotetut asiayhteydet sivupalkissa + mobile_todos_per_page: Toimenpidettä sivulla (mobiilisivustolla) + verbose_action_descriptors: Verbose action descriptors + staleness_starts: Vanhentumisen alkaminen + review_period: Project review interval + sms_context: Sähköpostin oletusasiayhteys + title_date_format: Title date format + show_number_completed: Show number of completed actions + refresh: Refresh interval (in minutes) + week_starts: Week starts on + last_name: Sukunimi + locale: Kieli + due_style: Due style + time_zone: Aikavyöhyke + show_project_on_todo_done: Go to project page on completing todo + sms_email: From email + first_name: Etunimi + show_completed_projects_in_sidebar: Show completed projects in sidebar + note: + created_at: Luotu + updated_at: Päivitetty + errors: + messages: + greater_than_or_equal_to: must be greater than or equal to %{count} + record_invalid: "Validation failed: %{errors}" + confirmation: doesn't match confirmation + less_than_or_equal_to: must be less than or equal to %{count} + blank: can't be blank + invalid: "cannot contain the comma (',') character" + exclusion: is reserved + odd: must be odd + even: must be even + too_short: is too short (minimum is %{count} characters) + empty: can't be empty + wrong_length: is the wrong length (should be %{count} characters) + less_than: must be less than %{count} + greater_than: must be greater than %{count} + equal_to: must be equal to %{count} + accepted: must be accepted + too_long: is too long (maximum is %{count} characters) + taken: has already been taken + inclusion: is not included in the list + not_a_number: is not a number + models: + project: + attributes: + name: + blank: project must have a name + too_long: project name must be less than 256 characters + taken: already exists + full_messages: + format: "%{attribute} %{message}" + template: + body: "There were problems with the following fields:" + header: + one: 1 error prohibited this %{model} from being saved + other: "%{count} errors prohibited this %{model} from being saved" + models: + project: + feed_title: Tracks Projects + feed_description: Lists all the projects for %{username} + todo: + error_date_must_be_future: must be a date in the future + user: + error_context_not_associated: Context id %{context} not associated with user id %{user}. + error_project_not_associated: Project id %{project} not associated with user id %{user}. + preference: + due_on: Due on %{date} + due_in: Due in %{days} days + due_styles: + - Due in ___ days + - Due on _______ + datetime: + prompts: + minute: Minute + second: Seconds + month: Month + hour: Hour + day: Day + year: Year + distance_in_words: + less_than_x_minutes: + one: less than a minute + other: less than %{count} minutes + zero: less than 1 minute + x_days: + one: 1 day + other: "%{count} days" + almost_x_years: + one: almost 1 year + other: almost %{count} years + x_seconds: + one: 1 second + other: "%{count} seconds" + about_x_hours: + one: about 1 hour + other: about %{count} hours + less_than_x_seconds: + one: less than 1 second + other: less than %{count} seconds + zero: less than 1 second + x_months: + one: 1 month + other: "%{count} months" + x_minutes: + one: 1 minute + other: "%{count} minutes" + about_x_years: + one: about 1 year + other: about %{count} years + about_x_months: + one: about 1 month + other: about %{count} months + over_x_years: + one: over 1 year + other: over %{count} years + half_a_minute: half a minute + time: + am: am + formats: + default: "%a, %d %b %Y %H:%M:%S %z" + time: "" + short: "%d %b %H:%M" + month_day: "%B %d" + long: "%B %d, %Y %H:%M" + stats: "%a %d-%m" + pm: pm + date: + month_names: + - + - Tammikuu + - Helmikuu + - Maaliskuu + - Huhtikuu + - Toukokuu + - Kesäkuu + - Heinäkuu + - Elokuu + - Syyskuu + - Lokakuu + - Marraskuu + - Joulukuu + abbr_day_names: + - Su + - Ma + - Ti + - Ke + - To + - Pe + - La + order: + - :year + - :month + - :day + formats: + only_day: "" + default: "%d.%m.%Y" + short: "%b %d" + month_day: "" + long: "%B %d, %Y" + longer: "%A %B %d, %Y" + day_names: + - Sunnuntai + - Maanantai + - Tiistai + - Keskiviikko + - Torstai + - Perjantai + - Lauantai + abbr_month_names: + - + - Tammi + - Helmi + - Maalis + - Huhti + - Touko + - Kesä + - Heinä + - Elo + - Syys + - Loka + - Marras + - Joulu + support: + array: + words_connector: ", " + last_word_connector: " ja " + two_words_connector: " ja " + select: + prompt: Valitse + errors: + user_unauthorized: "401 Pääsy kielletty: Vain ylläpitäjillä on pääsy tähän toiminnallisuuteen." + common: + back: Takaisin + third: Kolmas + recurring_todos: Toistuvat toimenpiteet + actions: Toimenpiteet + actions_midsentence: + zero: toimenpidettä + one: toimenpide + other: toimenpidettä + add: Lisää + previous: Edellinen + show_all: Näytä kaikki + logout: Kirjaudu ulos + go_back: Takaisin + optional: valinnainen + week: viikko + cancel: Peruuta + none: Ei + second: sekunti + month: kuukausi + server_error: Palvelimella tapahtui virhe. + notes: Muistiinpanot + review: Käsittely + last: Viimeinen + projects: Projektit + action: Toimenpide + project: Projekti + ok: Ok + contribute: Osallistu + website: Web-sivusto + first: Ensimmäinen + numbered_step: Askel %{number} + sort: + by_task_count_title: Lajittele tehtävämäärän mukaan + by_task_count_title_confirm: Haluatko varmasti lajitella nämä projektit tehtävämäärän mukaan? Tämä korvaa nykyisen lajittelujärjestyksen. + alphabetically: Aakkosjärjestyksessä + alphabetically_confirm: Haluatko varmasti lajitella nämä projektit aakkosjärjestykseen? Tämä korvaa nykyisen lajittelujärjestyksen. + alphabetically_title: Lajittele projektit aakkosjärjestykseen + sort: Lajittele + by_task_count: Tehtävämäärän mukaan + fourth: Neljäs + create: Luo + months: kuukautta + contexts: Asiayhteydet + errors_with_fields: "Seuraavien kenttien kanssa esiintyi ongelmia:" + next: Seuraava + todo: tehtävä + note: + zero: "ei muistiinpanoja" + one: "1 muistiinpano" + other: "%{count} muistiinpanoa" + context: Asiayhtyes + drag_handle: VEDÄ + description: Kuvaus + bugs: Ohjelmavirheet + update: Päivitä + forth: Neljäs + weeks: viikkoa + wiki: Wiki + email: Sähköposti + mailing_list: Postituslista + search: Haku + ajaxError: Virhe noudettaessa palvelimelta + days_midsentence: + zero: päivää + one: päivä + other: päivää + deferred: lykätty + not_available_abbr: "ei" + collapse_expand: Sulje/avaa + shared: + multiple_next_actions: Useita seuraavia toimenpiteitä (omilla riveillään) + hide_form: Piilota lomake + toggle_single: Lisää seuraava toimenpide + add_action: Lisää toimenpide + add_actions: Lisää toimenpiteitä + add_context: Lisää asiayhteys + tags_for_all_actions: Asiasanat kaikille toimenpiteille (pilkulla erotettuna) + toggle_single_title: Lisää uusi seuraava toimenpide + project_for_all_actions: Projekti kaikille toimenpiteille + context_for_all_actions: Asiayhteys kaikille toimenpiteille + toggle_multi: Lisää useita + separate_tags_with_commas: erota pilkulla + toggle_multi_title: Toggle single/multi new action form + hide_action_form_title: Piilota toimenpiteen lisäyslomake + make_actions_dependent: Määritä toimenpiteet riippuvaisiksi toisistaan + states: + contexts: + hidden: Piilotetut asiayhteydet + active: Aktiiviset asiayhteydet + closed: Suljetut asiayhteydet + projects: + active: Aktiiviset projektit + blocked: Estetyt + closed: Suljetut projektit + completed: Valmiit + current: Nykyinen + hidden: Piilotetut projektit + review: Käsittele + stalled: Stalled + hidden_plural: Piilotettu + completed: Valmis + completed_plural: Valmis + visible_plural: Näkyvä + visible: Näkyvä + close: Suljettu + closed_plural: Suljettu + active_plural: Aktiivinen + hidden: Piilotettu + active: Aktiivinen + review_plural: Päivätty + review: Päivätty + stalled_plural: Stalled + stalled: Stalled + blocked_plural: Estetty + blocked: Estetty + current_plural: Ajan tasalla + current: Ajan tasalla + layouts: + toggle_notes: Toggle notes + toggle_contexts: "Toggle collapsed contexts" + toggle_contexts_title: "Make collapsed contexts (in)visible" + next_actions_rss_feed: RSS feed of next actions + toggle_notes_title: Toggle all notes + mobile_navigation: + new_action: Uusi + logout: Kirjaudu ulos + feeds: Syötteet + full: Täysi sivusto + starred: Tähditetyt + projects: Projektit + tickler: Tulevat + contexts: Asiayhteydet + home: Etusivu + navigation: + manage_users_title: Lisää tai poista käyttäjiä + recurring_todos: Toistuvat toimenpiteet + api_docs: REST-rajapintadokumentaatio + feeds: Syötteet + starred: Tähdellä merkityt + notes_title: Näytä kaikki muistiinpanot + review_title: Make review + stats: Tilastot + tickler_title: Tulevat + manage_users: Hallitse käyttäjiä + export_title: Vie tietoja + import_title: Tuo tietoja + preferences: Asetukset + integrations_: Integroi Tracks + feeds_title: Näytä lista syötteistä + calendar_title: Kalenteri määräpäivistä + completed_tasks: Valmis + stats_title: Näytä tilastosi + tickler: Tulevat + home_title: Etusivu + starred_title: Näytä tähdellä merkityt toimenpiteesi + recurring_todos_title: Hallitse toistuvia toimenpiteitä + view: Näytä + organize: Järjestele + completed_tasks_title: Valmiit + home: Etusivu + export: Vie + import: Tuo + contexts_title: Asiayhteydet + calendar: Kalenteri + projects_title: Projektit + search: Hae kaikesta + preferences_title: Näytä asetukseni + admin: Ylläpito + help: "?" + help_page: Ohje + mobile: Mobiilisivusto + group_view_by_context: "Ryhmittele asiayhteyden mukaan" + group_view_by_project: "Ryhmittele projektin mukaan" + group_view_by_title: "Muuta sivun toimenpiteiden ryhmittelyä" + show_empty_containers_project: "Näytä tyhjät projektit" + show_empty_containers_context: "Näytä tyhjät asiayhteydet" + show_empty_containers_title: "Näytä tai piilota tyhjät asiayhteydet tai projektit" + options: Asetukset + footer: + send_feedback: Lähetä palautetta versiosta %{version} + sidebar: + list_name_active_contexts: Aktiiviset asiayhteydet + list_name_active_projects: Aktiiviset projektit + list_empty: Ei + list_name_completed_projects: Valmiit projektit + list_name_hidden_projects: Piilotetut projektit + list_name_hidden_contexts: Piilotetut asiayhteydet + todos: + no_actions: + hidden: Currently there are no hidden actions found + tag_hidden: Currently there are no hidden actions found + without_project: Currently there are no actions without a project + deferred_pending: "Currently there are no deferred or pending actions" + recurring_todos: Currently there are no recurring todos + completed: Currently there are no completed actions + title: Toimenpiteitä ei löytynyt + not_done_with_tag: "Tagilla '%{param}' merkittyjä keskeneräisiä toimenpiteitä ei löytynyt" + not_done_project: Tähän projektiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt + not_done_context: Tähän kontekstiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt + completed_recurring: Currently there are no completed recurring todos + not_done: Currently there are no incomplete actions + project: Currently there are no incomplete actions in this project + context: Currently there are no incomplete actions in this context + completed_today: No actions were completed today + completed_rest_of_week: No actions were completed in the rest of this week + completed_rest_of_month: No actions were completed in the rest of this month + due_today: No actions due today + due_this_week: No actions due this week + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_after_this_month: No actions due after this month + actions: + completed: Completed actions + home_completed: Completed actions + tag_completed: "Completed actions tagged with '%{param}'" + home_without_project: "Actions without project" + context_without_project: "Actions without project in %{param}" + project_project: "Actions in this project" + project_deferred_pending: Deferred/pending actions in this project + context_deferred_pending: Deferred/pending actions in this context + tag_deferred_pending: "Deferred/pending actions tagged with '%{param}'" + project_completed: Completed actions in this project + context_completed: Completed actions in this context + tag_hidden: "Tagilla '%{param}' merkityt piilotetut toimenpiteet" + error: + invalid_due_date: "Invalid due date" + invalid_show_from_date: "Invalid show from date" + completed_today: Completed today + completed_rest_of_week: Completed in the rest of this week + completed_rest_of_month: Completed in the rest of this month + show_from: Show from + error_starring_recurring: "Could not toggle the star of recurring todo '%{description}'" + recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added + completed_recurring: Completed recurring todos + added_new_next_action: Added new next action + completed_rest_of_previous_month: Completed in the rest of the previous month + blocked_by: Blocked by %{predecessors} + star_action: Merkitse toimenpide tähdellä + completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed + defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. + unable_to_add_dependency: Unable to add dependency + done: Done? + star_action_with_description: "star the action '%{description}'" + tagged_with: "tagged with '%{tag_name}'" + completed: Completed + edit_action_with_description: "Edit the action '%{description}'" + action_due_on: (määräaika %{date}) + remove_dependency: Remove dependency (does not delete the action) + archived_tasks_title: TRACKS::Archived completed tasks + list_incomplete_next_actions: Lists incomplete next actions + tags: Tags (separate with commas) + action_deleted_success: Successfully deleted next action + new_related_todo_created: A new todo was added which belongs to this recurring todo + context_changed: Context changed to %{name} + add_another_dependency: Add another dependency + mobile_todos_page_title: All actions + delete_recurring_action_title: Delete the recurring action + removed_predecessor: Removed %{successor} as dependency from %{predecessor}. + recurring_actions_title: TRACKS::Recurring Actions + next_action_needed: You need to submit at least one next action + action_saved: Action saved + scheduled_overdue: Scheduled to show %{days} days ago + action_deleted_error: Failed to delete the action + edit_action: Edit action + added_new_context: Added new context + next_actions_description: "Filter:" + list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions + set_to_pending: "%{task} set to pending" + added_new_project: Added new project + next_actions_title_additions: + completed: actions completed + due_today: due today + due_within_a_week: due within a week + append_in_this_project: in this project + error_deleting_item: There was an error deleting the item %{description} + task_list_title: TRACKS::List tasks + no_actions_due_this_week: No actions due in rest of this week + error_completing_todo: There was an error completing / activating the recurring todo %{description} + recurring_pattern_removed: The recurrence pattern is removed from %{count} + convert_to_project: Make project + delete_recurring_action_confirm: "Are you sure that you want to delete the recurring action '%{description}'?" + completed_last_day: Completed in the last 24 hours + show_in_days: Näytetään %{days} päivän kuluttua + no_project: --No project-- + error_saving_recurring: "There was an error saving the recurring todo '%{description}'" + new_related_todo_created_short: created a new todo + all_completed: All completed actions + feed_title_in_context: "in context '%{context}'" + completed_tagged_page_title: "TRACKS::Completed tasks with tag '%{tag_name}'" + edit: Edit + pending: Odottaa + completed_actions_with: "Completed actions with the tag '%{tag_name}'" + deleted_success: The action was deleted successfully. + completed_tasks_title: TRACKS::Completed tasks + feed_title_in_project: "in project '%{project}'" + clear_due_date: Clear due date + hidden_actions: Hidden actions + error_removing_dependency: There was an error removing the dependency + was_due_on_date: was due on %{date} + show_on_date: Show on %{date} + recurrence_period: Toistuvuusjakso + deferred_actions_with: "Deferred actions with the tag '%{tag_name}'" + recurring_deleted_success: The recurring action was deleted successfully. + confirm_delete: "Are you sure that you want to delete the action '%{description}'?" + deferred_tasks_title: TRACKS::Tulevat + next_actions_title: Tracks - Next Actions + next_action_description: Next action description + clear_show_from_date: Clear show from date + calendar_page_title: TRACKS::Kalenteri + unresolved_dependency: The value you entered in the dependency field did not resolve to an existing action. This value will not be saved with the rest of the action. Continue? + in_hidden_state: in hidden state + show_today: Show Today + next_actions_due_date: + overdue_by: Myöhässä %{days} päivää + due_today: Tehtävä tänään + due_in_x_days: Määräaika %{days} päivän päästä + overdue_by_plural: Myöhässä %{days} päivää + due_tomorrow: Tehtävä huomenna + completed_last_x_days: Completed in the last %{count} days + defer_x_days: + one: Defer 1 day + other: Defer %{count} days + added_new_next_action_singular: Added new next action + feeds: + completed: "Completed: %{date}" + due: "Due: %{date}" + deferred_pending_actions: Deferred/pending actions + has_x_pending: + one: Has one pending action + other: Has %{count} pending actions + delete_action: Delete action + error_deleting_recurring: "There was an error deleting the recurring todo '%{description}'" + recurring_todos: Toistuvat toimenpiteet + delete: Delete + cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! + drag_action_title: Drag onto another action to mark that action as a dependency for this action. + no_last_completed_actions: No completed actions found + depends_on: Depends on + 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." + action_marked_complete: "The action '%{description}' was marked as %{completed}" + added_new_next_action_plural: Added new next actions + new_related_todo_not_created_short: did not create todo + error_starring: "Could not toggle the star of this todo '%{description}'" + calendar: + get_in_ical_format: Get this calendar in iCal format + due_today: Tehtävä tänään + due_this_week: Tehtävä loppuviikon aikana + due_next_week: Tehtävä ensi viikolla + due_this_month: Tehtävä loppukuukauden %{month} aikana + due_after_this_month: Tehtävä %{next_month} ja myöhemmin + show_tomorrow: Show Tomorrow + tagged_page_title: "TRACKS::Tagged with '%{tag_name}'" + action_deferred: "The action '%{description}' was deferred" + mark_complete: Merkitse valmiiksi + recurrence: + ends_on_number_times: Päättyy %{number} toiston jälkeen + ends_on_date: Päättyy %{date} + every_work_day: Joka työpäivä + weekly_options: Asetukset viikottain toistuville toimenpiteille + weekly: Viikottain + monthly_options: Asetukset kuukausittain toistuville toimenpiteille + starts_on: Alkaa + daily_options: Asetukset päivittäin toistuville toimenpiteille + monthly: Kuukausittain + pattern: + month_names: + - + - Tammikuu + - Helmikuu + - Maaliskuu + - Huhtikuu + - Toukokuu + - Kesäkuu + - Heinäkuu + - Elokuu + - Syyskuu + - Lokakuu + - Marraskuu + - Joulukuu + third: kolmas + every_n: joka %{n} + every_n_days: joka %{n} päivä + every_n_months: joka %{n} kuukausi + every_day: joka päivä + on_day_n: on day %{n} + second: sekunti + every_xth_day_of_every_n_months: every %{x} %{day} of every %{n_months} + from: from + weekly: viikottain + last: last + the_xth_day_of_month: the %{x} %{day} of %{month} + times: for %{number} times + on_work_days: työpäivinä + first: ensimmäinen + every_year_on: every year on %{date} + day_names: + - sunnuntai + - maanantai + - tiistai + - keskiviikko + - torstai + - perjantai + - lauantai + show: show + fourth: fourth + due: due + until: until + every_month: every month + daily: Päivittäin + yearly_every_x_day: Joka %{month} %{day} + recurrence_on: + options: Käytä laskettua päivää + due_date: toimenpiteen määräpäivän asettamiseen + show_options: Näytä toimenpide + show_always: aina + show_days_before: "vasta %{days} päivä(ä) ennen määräpäivää" + from_tickler: toimenpiteen näyttämispäivän asettamiseen (älä aseta määräpäivää) + daily_every_number_day: Joka %{number} päivä + weekly_every_number_week: Returns every %{number} week on + ends_on: Päättyy + no_end_date: Ei päättymispäivää + day_x_on_every_x_month: Day %{day} on every %{month} month + yearly_options: Settings for yearly recurring actions + yearly_every_xth_day: The %{day} %{day_of_week} of %{month} + monthly_every_xth_day: The %{day} %{day_of_week} of every %{month} month + yearly: Vuosittain + added_dependency: Added %{dependency} as dependency. + all_completed_tagged_page_title: TRACKS::All completed tasks with tag %{tag_name} + recurrence_completed: There is no next action after the recurring action you just finished. The recurrence is completed + error_toggle_complete: Could not mark this todo complete + in_pending_state: in pending state + due: Due + action_marked_complete_error: "The action '%{description}' was NOT marked as %{completed} due to an error on the server." + depends_on_separate_with_commas: Depends on (separate with commas) + action_saved_to_tickler: Action saved to tickler + recurring_action_saved: Recurring action saved + completed_in_archive: + one: There is a completed action in the archive. + other: There are %{count} completed actions in the archive. + to_tickler: to tickler + next_actions_description_additions: + completed: in the last %{count} days + due_date: with a due date %{due_date} or earlier + overdue: Overdue + add_new_recurring: Lisää uusi toistuva toimenpide + edit_recurring_todo: Muokkaa toistuvaa toimenpidettä + see_all_completed: You can see all completed actions %{link} + all_completed_here: here + completed_recurring_actions_title: 'TRACKS::Completed recurring actions' + contexts: + delete_context_title: Poista asiayhteys + all_completed_tasks_title: "TRACKS::All Completed actions in the context '%{context_name}'" + hide_form: Piilota lomake + show_form_title: Lisää asiayhteys + delete_context_confirmation: "Are you sure that you want to delete the context '%{name}'? Be aware that this will also delete all (recurring) actions in this context!" + delete_context: Poista asiayhteys + edit_context: Muokkaa asiayhteyttä + hide_form_title: Piilota asiayhteyden lisäyslomake + context_hide: Piilota etusivulta? + context_state: Asiayhteyden tila + hidden_contexts: Piilotetut asiayhteydet + no_contexts_active: Currently there are no active contexts + no_contexts_closed: Currently there are no closed contexts + show_form: Luo uusi asiayhteys + visible_contexts: Näkyvät asiayhteydet + save_status_message: Asiayhteys tallennettu + add_context: Lisää asiayhteys + context_name: Asiayhteyden nimi + update_status_message: Name of context was changed + completed_tasks_title: "TRACKS::Completed actions in the context '%{context_name}'" + new_context_post: "' will be also created. Are you sure?" + status_active: Context is active + last_completed_in_context: "(last %{number})" + context_deleted: "Deleted context '%{name}'" + no_contexts_hidden: Currently there are no hidden contexts + new_context_pre: New context ' + status_hidden: Context is hidden + todos_append: in this context + projects: + was_marked_hidden: has been marked as hidden + edit_project_title: Edit project + default_tags_removed_notice: Removed the default tags + default_context_set: Set project's default context to %{default_context} + all_completed_tasks_title: "TRACKS::List All Completed Actions in Project '%{project_name}'" + hide_form: Piilota lomake + page_title: "TRACKS::Project: %{project}" + show_form_title: Create a new project + list_completed_projects: TRACKS::List Completed Projects + to_new_project_page: Take me to the new project page + no_notes_attached: Currently there are no notes attached to this project + this_project: This project + project_state: Project is %{state}. + last_completed_in_project: (last %{number}) + no_last_completed_projects: Valmiita projekteja ei löytynyt + notes: Notes + no_last_completed_recurring_todos: Valmiita toistuvia toimenpiteitä ei löytynyt + notes_empty: There are no notes for this project + no_projects: Currently there are no projects + hide_form_title: Hide new project form + with_no_default_context: with no default context + delete_project: Delete project + show_form: Add a project + actions_in_project_title: Actions in this project + delete_project_confirmation: "Are you sure that you want to delete the project '%{name}'?" + with_default_context: "with a default context of '%{context_name}'" + set_default_tags_notice: Set project's default tags to %{default_tags} + is_active: is active + settings: Settings + completed_projects: Completed projects + with_default_tags: "and with '%{tags}' as the default tags" + list_projects: TRACKS::List Projects + list_reviews: TRACKS::Review + project_saved_status: Project saved + project_destroyed_status: "Deleted project '%{name}'" + add_project: Add Project + add_note: Add a note + completed_tasks_title: "TRACKS::List Completed Actions in Project '%{project_name}'" + delete_project_title: Delete the project + hidden_projects: Hidden projects + add_note_submit: Add note + was_marked_complete: has been marked as completed + default_context_removed: Removed default context + default_context: The default context for this project is %{context} + status_project_name_changed: Name of project was changed + active_projects: Active projects + no_default_context: This project does not have a default context + with_no_default_tags: and with no default tags + edit_project_settings: Muokkaa projektin asetuksia + state: Tämä projekti on %{state} + notes: + delete_confirmation: "Oletko varma, että haluat poistaa muistiinpanon '%{id}'?" + delete_item_title: Poista + delete_note_title: "Poista muistiinpano '%{id}'" + note_link_title: Show note %{id} + show_note_title: Show note + deleted_note: "Muistiinpano '%{id}' poistettu" + edit_item_title: Muokkaa + note_location_link: "Kuuluu:" + no_notes_available: "Muistiinpanoja ei löytynyt. Voit lisätä niitä projekteihin projektisivulta." + note_header: Muistiinpano %{id} + delete_note_confirm: "Oletko varma että haluat poistaa muistiinpanon '%{id}'?" + in_project: "Kuuluu: " + save_status_message: "Muistiinpano %{id} tallennettu" + integrations: + opensearch_description: Search in Tracks + preferences: + open_id_url: Your OpenID URL is + staleness_starts_after: Toimenpide alkaa vanhentumaan %{days} päivän kuluttua + change_identity_url: Change Your Identity URL + change_password: Muuta salasanasi + password_changed: Salasanasi on muutettu, kirjaudu uudelleen sisään. + updated: Asetukset päivitetty + page_title: TRACKS::Asetukset + title: Asetuksesi + token_description: Avainkoodi (syötteiden ja rajapinnan käyttämiseen) + is_false: "false" + show_number_completed: Näytä %{number} valmista toimenpidettä + page_title_edit: TRACKS::Muokkaa asetuksia + is_true: "true" + edit_preferences: Muokkaa asetuksia + sms_context_none: Ei mikään + generate_new_token: Luo uusi avainkoodi + token_header: Avainkoodisi + authentication_header: Your authentication + current_authentication_type: Your authentication type is %{auth_type} + change_authentication_type: Change your authentication type + tabs: + authentication: Authentication + tracks_behavior: Tracks behavior + profile: Profile + date_and_time: Date and time + generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. + data: + import_successful: Tuonti onnistui + import_errors: Some errors occurred during import + import_destination_invalid: Invalid import destination + stats: + index_title: TRACKS::Tilastot + within_one: Within 1 + tag_cloud_title: Tag cloud for all actions + tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) + tag_cloud_90days_title: Tag cloud actions in past 90 days + actions: Actions + totals_active_project_count: Of those %{count} are active projects + actions_last_year_legend: + number_of_actions: Number of actions + months_ago: Months ago + totals_first_action: Since your first action on %{date} + actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. + top10_longrunning: Top 10 longest running projects + actions_dow_30days_title: Day of week (past 30 days) + legend: + actions: Actions + number_of_days: Number of days ago + number_of_actions: Number of actions + day_of_week: Day of week + percentage: Percentage + running_time: Running time of an action (weeks) + months_ago: Months ago + current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions + open_per_week: Active (visible and hidden) next actions per week + open_per_week_legend: + actions: Actions + weeks: Weeks ago + totals_deferred_actions: "of which %{count} are deferred actions in the tickler" + running_time_legend: + actions: Actions + percentage: Percentage + weeks: Running time of an action (weeks). Click on a bar for more info + totals_action_count: you have a total of %{count} actions + totals_incomplete_actions: You have %{count} incomplete actions + totals_unique_tags: Of those tags, %{count} are unique. + actions_avg_completed_30days: and completed an average of %{count} actions per day. + top5_contexts: Top 5 contexts + actions_lastyear_title: Actions in the last 12 months + totals_actions_completed: "%{count} of these are completed." + totals_context_count: You have %{count} contexts. + totals_visible_context_count: Of those %{count} are visible contexts + totals_blocked_actions: "%{count} are dependent on the completion of their actions." + projects: Projects + action_completion_time_title: Completion time (all completed actions) + actions_last_year: Actions in the last years + actions_min_max_completion_days: The Min-/maximum days to complete is %{min}/%{max}. + tags: Tags + actions_min_completion_time: The minimum time to complete is %{time}. + no_tags_available: no tags available + actions_day_of_week_title: Day of week (all actions) + totals_project_count: You have %{count} projects. + running_time_all: Current running time of all incomplete actions + actions_30days_title: Actions in the last 30 days + time_of_day: Time of day (all actions) + totals_hidden_project_count: "%{count} are hidden" + tod30: Time of day (last 30 days) + tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. + more_stats_will_appear: More statistics will appear here once you have added some actions. + top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions + actions_further: " and further" + totals_tag_count: You have %{count} tags placed on actions. + top10_projects_30days: Top 10 project in past 30 days + spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts + actions_selected_from_week: "Actions selected from week " + spread_of_actions_for_all_context: Spread of actions for all contexts + click_to_show_actions_from_week: Click %{link} to show the actions from week %{week} and further. + other_actions_label: (others) + top10_projects: Top 10 projects + totals_completed_project_count: and %{count} are completed projects. + actions_avg_created: In the last 12 months you created on average %{count} actions + click_to_return: Click %{link} to return to the statistics page. + actions_avg_completed: and completed an average of %{count} actions per month. + totals: Totals + time_of_day_legend: + number_of_actions: Number of actions + time_of_day: Time of day + contexts: Contexts + click_to_return_link: here + totals_hidden_context_count: and %{count} are hidden contexts. + labels: + month_avg_completed: "%{months} Month avg completed" + completed: Completed + month_avg_created: "%{months} Month avg created" + avg_created: Avg created + avg_completed: Avg completed + created: Created + running_time_all_legend: + actions: Actions + percentage: Percentage + running_time: Running time of an action (weeks). Click on a bar for more info + click_to_update_actions: Click on a bar in the chart to update the actions below. + no_actions_selected: There are no actions selected. + actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions + actions_dow_30days_legend: + number_of_actions: Number of actions + day_of_week: Day of the week + actions_day_of_week_legend: + number_of_actions: Number of actions + day_of_week: Day of the week + tod30_legend: + number_of_actions: Number of actions + time_of_day: Time of day + action_selection_title: TRACKS::Action selection + users: + successfully_deleted_user: Successfully deleted user %{username} + failed_to_delete_user: Failed to delete user %{username} + total_contexts: Total contexts + first_user_heading: "Welcome to TRACKS. To get started, please create an admin account:" + openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. + auth_type_update_error: "There was a problem updating your authentication type: %{error_messages}" + destroy_successful: User %{login} was successfully destroyed + new_token_generated: New token successfully generated + total_projects: Total projects + signup_successful: Signup successful for user %{username}. + change_password_submit: Change password + no_signups_title: TRACKS::Ei rekisteröitymisiä + user_created: User created. + manage_users: Manage users + account_signup: Account signup + password_updated: Password updated. + desired_login: Desired login + signup: Signup + confirm_password: Confirm password + new_user_heading: "Sign up a new user:" + auth_type_updated: Authentication type updated. + total_actions: Total actions + change_password_title: TRACKS::Change password + change_auth_type_title: TRACKS::Change authentication type + change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. + password_confirmation_label: Confirm password + destroy_error: There was an error deleting the user %{login} + choose_password: Choose password + register_with_cas: With your CAS username + label_auth_type: Authentication type + new_password_label: New password + you_have_to_reset_your_password: "You have to reset your password" + first_user_title: TRACKS::Sign up as the admin user + new_user_title: TRACKS::Sign up + destroy_user: Destroy user + total_users_count: You have a total of %{count} users + destroy_confirmation: "Warning: this will delete user '%{login}', all their actions, contexts, project and notes. Are you sure that you want to continue?" + signup_new_user: Sign up new user + openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. + identity_url: Identity URL + auth_change_submit: Change authentication type + change_authentication_type: Change authentication type + total_notes: Total notes + select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. + feedlist: + choose_context: Choose the context you want a feed of + actions_due_today: Actions due today or earlier + rss_feed: RSS Feed + ical_feed: iCal feed + all_contexts: All Contexts + legend: "Legend:" + all_projects: All Projects + choose_project: Choose the project you want a feed of + select_feed_for_project: Select the feed for this project + active_projects_wo_next: Active projects with no next actions + project_needed: There needs to be at least one project before you can request a feed + active_starred_actions: All starred, active actions + select_feed_for_context: Select the feed for this context + projects_and_actions: Active projects with their actions + context_needed: There needs to be at least one context before you can request a feed + actions_due_next_week: Actions due in 7 days or earlier + notice_incomplete_only: "Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page" + all_actions: All actions + actions_completed_last_week: Actions completed in the last 7 days + context_centric_actions: Feeds for incomplete actions in a specific context + plain_text_feed: Plain Text Feed + last_fixed_number: Last %{number} actions + project_centric: Feeds for incomplete actions in a specific project + login: + login_cas: go to the CAS + sign_in: Sign in + openid_identity_url_not_found: "Sorry, no user by that identity URL exists (%{identity_url})" + user_no_expiry: Stay logged in + cas_no_user_found: "Hello, %{username}! You do not have an account on Tracks." + cas_login: CAS Login + successful_with_session_info: "Login successful:" + please_login: Please log in to use Tracks + cas_logged_in_greeting: "Hello, %{username}! You are authenticated." + cas_username_not_found: "Sorry, no user by that CAS username exists (%{username})" + mobile_use_openid: "…or login with an OpenID" + cas_create_account: If you like to request on please go here to %{signup_link} + account_login: Account login + cas_signup_link: Request account + session_will_not_expire: session will not expire. + successful: Logged in successfully. Welcome back! + option_separator: or, + session_time_out: Session has timed out. Please %{link} + session_will_expire: "session will expire after %{hours} hour(s) of inactivity." + login_standard: go back to the standard login + logged_out: You have been logged out of Tracks. + login_with_openid: login with an OpenID + unsuccessful: Login unsuccessful. + log_in_again: log in again. + search: + contexts_matching_query: Contexts matching query + tags_matching_query: Tags matching query + notes_matching_query: Notes matching query + no_results: Your search yielded no results. + todos_matching_query: Todos matching query + projects_matching_query: Projects matching query From 6d6fa8ad9f417ddded954d553e8e42534f7b301d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 10 Oct 2020 00:53:59 +0300 Subject: [PATCH 202/767] Add i18n-tasks --- Gemfile | 2 + Gemfile.lock | 17 ++++++ config/i18n-tasks.yml | 137 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 config/i18n-tasks.yml diff --git a/Gemfile b/Gemfile index c282b2a9..b2a2a052 100644 --- a/Gemfile +++ b/Gemfile @@ -59,6 +59,8 @@ group :development do gem "bullet" gem "rack-mini-profiler" gem "solargraph" + + gem 'i18n-tasks', '~> 0.9.31' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 079e5dd9..40cc2d6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,9 +118,20 @@ GEM sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) + highline (2.0.3) htmlentities (4.3.4) i18n (1.8.5) concurrent-ruby (~> 1.0) + i18n-tasks (0.9.31) + activesupport (>= 4.0.2) + ast (>= 2.1.0) + erubi + highline (>= 2.0.0) + i18n + parser (>= 2.2.3.0) + rails-i18n + rainbow (>= 2.2.2, < 4.0) + terminal-table (>= 1.5.1) jaro_winkler (1.5.4) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) @@ -197,6 +208,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) + rails-i18n (6.0.0) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 7) rails_autolink (1.1.6) rails (> 3.1) railties (6.0.3.4) @@ -275,6 +289,8 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) @@ -320,6 +336,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.13.0) htmlentities + i18n-tasks (~> 0.9.31) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml new file mode 100644 index 00000000..10c28526 --- /dev/null +++ b/config/i18n-tasks.yml @@ -0,0 +1,137 @@ +# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks + +# The "main" locale. +base_locale: en +## All available locales are inferred from the data by default. Alternatively, specify them explicitly: +# locales: [es, fr] +## Reporting locale, default: en. Available: en, ru. +# internal_locale: en + +# Read and write translations. +data: + ## Translations are read from the file system. Supported format: YAML, JSON. + ## Provide a custom adapter: + # adapter: I18n::Tasks::Data::FileSystem + + # Locale files or `File.find` patterns where translations are read from: + read: + ## Default: + # - config/locales/%{locale}.yml + ## More files: + # - config/locales/**/*.%{locale}.yml + + # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom: + # `i18n-tasks normalize -p` will force move the keys according to these rules + write: + ## For example, write devise and simple form keys to their respective files: + # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml'] + ## Catch-all default: + # - config/locales/%{locale}.yml + + # External locale data (e.g. gems). + # This data is not considered unused and is never written to. + external: + ## Example (replace %#= with %=): + # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml" + + ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class. + # router: conservative_router + + yaml: + write: + # do not wrap lines at 80 characters + line_width: -1 + + ## Pretty-print JSON: + # json: + # write: + # indent: ' ' + # space: ' ' + # object_nl: "\n" + # array_nl: "\n" + +# Find translate calls +search: + ## Paths or `File.find` patterns to search in: + # paths: + # - app/ + + ## Root directories for relative keys resolution. + # relative_roots: + # - app/controllers + # - app/helpers + # - app/mailers + # - app/presenters + # - app/views + + ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting: + ## %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json) + exclude: + - app/assets/images + - app/assets/fonts + - app/assets/videos + + ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`: + ## If specified, this settings takes priority over `exclude`, but `exclude` still applies. + # only: ["*.rb", "*.html.slim"] + + ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`. + # strict: true + + ## Multiple scanners can be used. Their results are merged. + ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well. + ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example + +## Translation Services +# translation: +# # Google Translate +# # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate +# google_translate_api_key: "AbC-dEf5" +# # DeepL Pro Translate +# # Get an API key and subscription at https://www.deepl.com/pro to use DeepL Pro +# deepl_api_key: "48E92789-57A3-466A-9959-1A1A1A1A1A1A" + +## Do not consider these keys missing: +# ignore_missing: +# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}' +# - '{devise,simple_form}.*' + +## Consider these keys used: +ignore_unused: +- 'activerecord.*' +- 'models.*' +- 'datetime.*' +- 'time.*' +- 'date.*' +# - '{devise,kaminari,will_paginate}.*' +# - 'simple_form.{yes,no}' +# - 'simple_form.{placeholders,hints,labels}.*' +# - 'simple_form.{error_notification,required}.:' + +## Exclude these keys from the `i18n-tasks eq-base' report: +# ignore_eq_base: +# all: +# - common.ok +# fr,es: +# - common.brand + +## Exclude these keys from the `i18n-tasks check-consistent-interpolations` report: +# ignore_inconsistent_interpolations: +# - 'activerecord.attributes.*' + +## Ignore these keys completely: +# ignore: +# - kaminari.* + +## Sometimes, it isn't possible for i18n-tasks to match the key correctly, +## e.g. in case of a relative key defined in a helper method. +## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.: +# +# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper', +# only: %w(*.html.haml *.html.slim), +# patterns: [['= title\b', '.page_title']] %> +# +# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.: +# +# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper', +# patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %> From 0db28e299f1025a70d40acdc2f2468f71fba3b33 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 10 Oct 2020 01:02:12 +0300 Subject: [PATCH 203/767] Normalise the locale files and add missing messages --- config/locales/cs.yml | 472 ++++++---- config/locales/de.yml | 426 +++++---- config/locales/en.yml | 1924 +++++++++++++++++++++-------------------- config/locales/es.yml | 332 ++++--- config/locales/fi.yml | 1914 +++++++++++++++++++++------------------- config/locales/fr.yml | 452 ++++++---- config/locales/he.yml | 1636 +++++++++++++++++++---------------- config/locales/nl.yml | 272 +++--- config/locales/ru.yml | 1825 +++++++++++++++++++------------------- 9 files changed, 5032 insertions(+), 4221 deletions(-) diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 5fa3c873..7231f9fe 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -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 @@ -41,8 +41,14 @@ cs: show_from: Zobrazovat od tags: Tagy user: + auth_type: Auth type + display_name: Display name + email: Email address first_name: Příjmení last_name: Jméno + login: Login + open_id_url: OpenID URL + password: Password errors: full_messages: format: "%{attribute} %{message}" @@ -63,6 +69,9 @@ cs: not_a_number: není číslo odd: must be odd record_invalid: 'Problém s daty: %{errors}' + restrict_dependent_destroy: + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее taken: už bylo zabráno too_long: je příliš dlouhé (maximum je %{count} znaků) too_short: je příliš krátké (minimum je %{count} znaků) @@ -80,17 +89,18 @@ cs: one: jedna chyba 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 bugs: Chyby cancel: Zrušit + collapse_expand: Collapse/expand context: Kontext contexts: Kontexty contribute: Přispět @@ -105,21 +115,22 @@ 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 + mailing_list: Mailing List 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" zero: 0 na vědomí notes: Poznámky - not_available_abbr: n/a numbered_step: Krok %{number} ok: Ok optional: volitelné @@ -134,16 +145,14 @@ cs: show_all: Zobrazit všechny sort: alphabetically: Abecedně - alphabetically_confirm: Určitě chcete řadit tyto projekty abecedně? Stávající - pořadí bude ztraceno. + alphabetically_confirm: Určitě chcete řadit tyto projekty abecedně? Stávající 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_confirm: Určitě chcete řadit tyto projekty podle počtu úkolů? - Stávající pořadí bude ztraceno. - sort: "Řadit" + 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 third: Třetí - todo: "úkol" + todo: úkol update: Uložit website: Webová stránka week: týden @@ -156,9 +165,9 @@ cs: context_deleted: Kontext byl odstraněn '%{name}' context_hide: Schovat z úvodní stránky? context_name: Náev kontextu + context_state: Context state delete_context: Smazat kontext - delete_context_confirmation: Opravdu chcete smazat kontext '%{name}'? Dojde ke - smazání všech (opakovaných) úkolů z daného kontextu! + delete_context_confirmation: Opravdu chcete smazat kontext '%{name}'? Dojde ke smazání všech (opakovaných) úkolů z daného kontextu! delete_context_title: Smazat kontext edit_context: Upravit kontext hidden_contexts: Schovat kontexty @@ -167,8 +176,10 @@ cs: last_completed_in_context: v tomto kontextu (posledních %{number}) 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_: 'No contexts ' + no_contexts_active: Žádné aktivní kontexty + no_contexts_closed: Currently there are no closed contexts + no_contexts_hidden: Žádné skryté kontexty save_status_message: Kontext uložen show_form: Nový kontext show_form_title: Nový kontext @@ -178,56 +189,60 @@ cs: update_status_message: Název kontextu byl změněn visible_contexts: Viditelné kontexty data: + import_destination_invalid: Invalid import destination import_errors: Při importu došlo k chybám import_successful: Import byl úspěšný. + invalid_import_destination: Invalid import destination date: 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" + month_day: Month day + only_day: Only day short: "%b %d" month_names: - - Leden - - "Únor" + - Únor - Březen - Duben - Květen - - "Červen" - - "Červenec" + - Červen + - Červenec - Srpen - Září - - "Říjen" + - Říjen - Listopad - Prosinec order: @@ -280,10 +295,34 @@ cs: second: Sekunda year: Rok errors: + format: "%{attribute} %{message}" + messages: + accepted: должен быть подтвержден + blank: должна быть заполнена + confirmation: не соответствует %{attribute} + empty: не может быть пустым + equal_to: должно равняться %{count} + even: должно быть четным + exclusion: зарезервированно + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше или равно %{count} + inclusion: не входит в список + invalid: неверное + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + not_an_integer: должно быть целым числом + odd: должно быть нечетным + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято + too_long: 'слишком длинное (максимум: %{count} символов)' + too_short: 'слишком кроткое (минимум: %{count} символов)' + wrong_length: неверной длины (должно быть %{count} символов) 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 @@ -299,20 +338,29 @@ cs: legend: 'Legenda:' notice_incomplete_only: 'Poznámka: všechny feedy obsahují jen nehotové úkoly.' plain_text_feed: Prostý text - projects_and_actions: Aktivní projekty a jejich úkoly project_centric: Feedy s aktivními úkoly podle projektu project_needed: Musíte nejdříve založit aspoň jeden projekt + projects_and_actions: Aktivní projekty a jejich úkoly rss_feed: RSS Feed select_feed_for_context: Select the feed for this context select_feed_for_project: Vyberte feed pro tento projekt footer: send_feedback: Poslat zpětnou vazbu na %{version} + helpers: + select: + prompt: Выберите + submit: + create: Создать %{model} + submit: Сохранить %{model} + update: Обновить %{model} integrations: opensearch_description: Prohledat Tracks layouts: mobile_navigation: + calendar: Calendar contexts: 2-Kontexty feeds: Feedy + full: Full Site home: 1-Domů logout: Odhlásit new_action: 0-Nový úkol @@ -331,13 +379,21 @@ cs: export_title: Import a export dat feeds: Feedy feeds_title: Seznam dostupných feedů + group_view_by_context: Group by context + group_view_by_project: Group by project + group_view_by_title: Change the grouping of the actions on this page help: "?" + help_page: Help home: Domů home_title: Domů + import: Import + import_title: Import data integrations_: Integrovat Tracks manage_users: Správa uživatelů manage_users_title: Přidat nebo smazat uživatele + mobile: Mobile Site notes_title: Zobrazit všechny poznámky + options: Options organize: Správa preferences: Nastavení preferences_title: Zobrazí možnosti nastavení @@ -346,6 +402,9 @@ cs: recurring_todos_title: Správa opakovaných úkolů review_title: Provést revizi search: Hledat + show_empty_containers_context: Show empty contexts + show_empty_containers_project: Show empty projects + show_empty_containers_title: Show or hide the empty projects or contexts starred: S hvězdou starred_title: Zobrazí úkoly s hvězdičkou stats: Statistiky @@ -366,20 +425,20 @@ cs: cas_no_user_found: Nazdar, %{username}! Nemáte účet na Tracks. cas_signup_link: Vyžádat účet cas_username_not_found: Bohužel neexistuje uživatel v CASu se jménem (%{username}) + log_in_again: přihlašte se znovu. logged_out: You have been logged out of Tracks. 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 - log_in_again: přihlašte se znovu. 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}) + openid_identity_url_not_found: Je nám líto, neexistuje uživatel s touto identitou (%{identity_url}) option_separator: nebo please_login: Pro pokračování se prosím přihlšte do Tracks session_time_out: Sezení vypršelo. Prosím %{link} session_will_expire: sezen vyprší za %{hours} hodin neaktivity. session_will_not_expire: sezení bylo nastaveno jako trvalé. sign_in: Přihlásit se + signup_prompt: Want to create an account? successful: Přihlášení úspěšné. Vítejte zpět! successful_with_session_info: 'Přihlášení bylo úspěšné:' unsuccessful: Přihlášení bylo úspěšné. @@ -391,6 +450,9 @@ cs: due_styles: - Plánováno za ___ dní - Plánováno na _______ + themes: + black: Black + light_blue: Light blue project: feed_description: Všechny projekty uživatele %{username} feed_title: Projekty @@ -400,18 +462,18 @@ cs: error_context_not_associated: Kontext %{context} nepatří uživateli %{user}. error_project_not_associated: Projekt %{project} nepatří uživateli %{user}. notes: - deleted_note: Smazat poznámku '%{id}' delete_confirmation: Opravdu chcete smazat poznámku '%{id}'? delete_item_title: Smazat položku delete_note_confirm: Opravdu chcete smazat poznámku '%{id}'? delete_note_title: Smazat poznámku '%{id}' + 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ů.' note_header: Poznámka %{id} note_link_title: Zobrazit poznámku %{id} note_location_link: 'V:' - no_notes_available: "Žádné poznámky: přidejte poznámky ze stránek jednotlivých - projektů." + save_status_message: Note %{id} was saved show_note_title: Zobrazit poznámku number: currency: @@ -420,14 +482,30 @@ cs: format: "%u%n" precision: 2 separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros unit: "$" format: delimiter: "," precision: 3 separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros human: + decimal_units: + format: "%n %u" + units: + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион + unit: "." format: + delimiter: Delimiter precision: 1 + significant: 'true' + strip_insignificant_zeros: 'true' storage_units: format: "%n %u" units: @@ -438,6 +516,13 @@ cs: kb: KB mb: MB tb: TB + percentage: + format: + delimiter: Delimiter + format: "%n%" + precision: + format: + delimiter: Delimiter preferences: authentication_header: Vaše autentizace change_authentication_type: Změna typu autentizace @@ -446,39 +531,44 @@ cs: current_authentication_type: Používáte autentizaci %{auth_type} edit_preferences: Editace nastavení generate_new_token: Generovat nového peška - generate_new_token_confirm: Opravdu? Nový pešek nahradí ten původní a způsobí - nefunkčnost ve všech aplikacích, kde jej používáte. + generate_new_token_confirm: Opravdu? Nový pešek nahradí ten původní a způsobí nefunkčnost ve všech aplikacích, kde jej používáte. is_false: ne is_true: ano open_id_url: Vaše OpenID URL je page_title: TRACKS::Nastavení page_title_edit: TRACKS::Editace nastavení password_changed: Heslo bylo změněno. Prosím znovu se přihlašte. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. 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 date_and_time: Datum a čas profile: Profil + remove_account: Remove account tracks_behavior: Chování Tracks title: Vaše nastavení token_description: Pešek (feedy a použití API) 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 add_project: Přidat projekt all_completed_tasks_title: TRACKS::Hotové úkoly projektu '%{project_name}' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty completed_projects: Hotové projetky completed_tasks_title: TRACKS::Hotové úkoly projektu '%{project_name}' default_context: Výchozí kontext pro tento projekt je %{context} default_context_removed: Výchozí kontext byl odstraněn default_context_set: Výchozí kontext %{default_context} byl nastaven default_tags_removed_notice: Výchozí štítky byly odstraněny + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty delete_project: Smazat projekt delete_project_confirmation: Opravdu chcete smazat projekt '%{name}'? delete_project_title: Smaže projekt @@ -488,21 +578,23 @@ cs: hide_form: Skrýt formulář hide_form_title: Schovat formulář založení projektu is_active: je aktivní + last_completed_in_project: "(last %{number})" list_completed_projects: TRACKS::Hotové projekty list_projects: TRACKS::Projekty list_reviews: TRACKS::Revize - notes: Poznámky - notes_empty: "Žádné poznámky" 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 page_title: 'TRACKS::Projekt: %{project}' + project_destroyed_status: Deleted project '%{name}' project_saved_status: Projekt byl uložen project_state: Projekt je %{state}. - settings: Nastavení set_default_tags_notice: Nastavit výchozí šítky úkolů v tomto projektu %{default_tags} + settings: Nastavení show_form: Nový projekt show_form_title: Nový projekt state: Tento projekt je %{state} @@ -517,8 +609,8 @@ cs: with_no_default_tags: a nemá žádné výchozí značky search: contexts_matching_query: Nalezené kontexty - notes_matching_query: Nalezené poznámky no_results: Na váš dotaz nebylo nic nalezeno. + notes_matching_query: Nalezené poznámky projects_matching_query: Nalezené projekty tags_matching_query: Nalezené štítky todos_matching_query: Nalezené úkoly @@ -530,7 +622,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) @@ -550,12 +642,29 @@ cs: active_plural: Aktivní blocked: Blokovaný blocked_plural: Blokované + close: Closed + closed_plural: Closed completed: Hotový completed_plural: Hotové + contexts: + ":": ":" + active: Active contexts + closed: Closed contexts + hidden: Hidden contexts current: Aktuální current_plural: Aktuální hidden: Skrytý hidden_plural: Skryté + projects: + ":": ":" + active: Active projects + blocked: Blocked + closed: Closed projects + completed: Completed + current: Current + hidden: Hidden projects + review: Review + stalled: Stalled review: Nerevidovaný review_plural: Nerevidované stalled: Opuštěný @@ -563,16 +672,15 @@ cs: visible: Viditelný visible_plural: Viditelné stats: - 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ů + 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_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. actions_avg_completed_30days: a dokončeno průměrně %{count} úkolů za den. - actions_avg_completion_time: Pro všechny vaše hotové úkoly je průměrný čas dokončení - %{count} dní. - actions_avg_created: Za posledních 12 měsíců bylo vytvořeno průměrně %{count} - úkolů + actions_avg_completion_time: Pro všechny vaše hotové úkoly je průměrný čas dokončení %{count} dní. + actions_avg_created: Za posledních 12 měsíců bylo vytvořeno průměrně %{count} úkolů actions_day_of_week_legend: day_of_week: Den v týdnu number_of_actions: Počet akcí @@ -582,24 +690,20 @@ cs: number_of_actions: Počet akcí actions_dow_30days_title: Dny v týdnu (posleních 30 dní) actions_further: a dále - actions_lastyear_title: "Úkoly za posledních 12 měsíců" - actions_last_year: "Úkoly v posledním roce" + 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_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" - action_completion_time_title: "Čas dokončení (všechny hotové úkoly)" - action_selection_title: TRACKS::výběr úkolů + 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 - %{week} a dalších. + click_to_show_actions_from_week: Klepněte %{link} pro zobrazení úkolů z týdne %{week} a dalších. click_to_update_actions: Klepněte na sloupec v grafu pro zobrazení detailů níže. contexts: Kontexty - current_running_time_of_incomplete_visible_actions: Aktuální čas běhu nedokončených - viditelných úkolů + current_running_time_of_incomplete_visible_actions: Aktuální čas běhu nedokončených viditelných úkolů index_title: TRACKS::Statistika labels: avg_completed: průměrně uzavřeno @@ -609,16 +713,16 @@ cs: 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í @@ -627,23 +731,20 @@ cs: 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ů - tags: "Štítky" - tag_cloud_90days_description: Tento mrak zahrnuje štítky úkolů, které byly vytvořeny - nebo dokončeny v posledních 90-ti dnech. + spread_of_running_actions_for_visible_contexts: Distribuce běžících úkolů do viditelných kontextů + tag_cloud_90days_description: Tento mrak zahrnuje štítky úkolů, které byly vytvořeny nebo dokončeny v posledních 90-ti dnech. tag_cloud_90days_title: Značky úkolů z posledních 90-ti dní - tag_cloud_description: Tento mrak zahrnuje štítky všech úkolů (hotových, nehotových, - viditelných i skrytých) + 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 time_of_day: Denní doba (všechny úkoly) time_of_day_legend: number_of_actions: Počet úkolů @@ -656,11 +757,10 @@ cs: top10_projects: Top 10 projektů top10_projects_30days: Top 10 projektů za posledních 30 dní top5_contexts: Top 5 kontextů - top5_visible_contexts_with_incomplete_actions: Top 5 viditelných kontextů s nehotovými - úkoly + top5_visible_contexts_with_incomplete_actions: Top 5 viditelných kontextů s nehotovými úkoly totals: Celkem - totals_actions_completed: "%{count} z nich je hotových." totals_action_count: máte celkem %{count} úkolů + 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_completed_project_count: a %{count} je hotových projektů. @@ -690,53 +790,66 @@ cs: month_day: "%B %d" short: "%d %b %H:%M" stats: "%a %d-%m" + time: Time 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_deleted_success: Úkol byl úspěšně smazán action_due_on: "(úkol plánován na %{date})" - action_marked_complete: "Úkol '%{description}' byl označen jako - %{completed}" - action_marked_complete_error: "Úkol '%{description}' NEBYL označen - jako %{completed} kvůli chybě na serveru." - action_saved: "Úkol uložen" - action_saved_to_tickler: "Úkol byl uložen do Tickleru" + action_marked_complete: Úkol '%{description}' byl označen jako %{completed} + action_marked_complete_error: Úkol '%{description}' NEBYL označen jako %{completed} kvůli chybě na serveru. + action_saved: Úkol uložen + action_saved_to_tickler: Úkol byl uložen do Tickleru + actions: + completed: Completed actions + context_completed: Completed actions in this context + context_deferred_pending: Deferred/pending actions in this context + context_without_project: Actions without project in %{param} + home_completed: Completed actions + home_without_project: Actions without project + project_completed: Completed actions in this project + project_deferred_pending: Deferred/pending actions in this project + project_project: Actions in this project + tag_completed: Completed actions tagged with '%{param}' + tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_hidden: Hidden actions tagged with '%{param}' + 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 - add_another_dependency: Přidat další závislost - add_new_recurring: Vytvořit opakovaný úkol all_completed: Všechny hotové úkoly all_completed_here: zde 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_after_this_month: Due in %{next_month} and later due_next_week: Plánované příští týden due_this_month: Plánováno na %{month} due_this_week: Plánované ve zbytku týdne due_today: Plánované dnes get_in_ical_format: Kalendář ve formátu iCal calendar_page_title: TRACKS::Kalendář - cannot_add_dependency_to_completed_todo: Nelze přidat úkol jako závislost k hotovému - úkolu! + cannot_add_dependency_to_completed_todo: Nelze přidat úkol jako závislost k hotovému úkolu! clear_due_date: Smazat plánované datum úkolu clear_show_from_date: Odstranit datum zobrazení completed: Hotovo + completed_actions: Completed actions completed_actions_with: Hotové úkoly se štítkem '%{tag_name}' completed_in_archive: one: V archivu je hotový úkol. other: V archivu je %{count} hotových úkolů. completed_last_day: Ukončené v posledních 24 hodinách completed_last_x_days: Uzavřené za posledních %{count} dní - completed_recurrence_completed: Bylo smazáno poslední opakování opakovaného úkolu. - Opakování dokončeno + completed_recurrence_completed: Bylo smazáno poslední opakování opakovaného úkolu. Opakování dokončeno completed_recurring: Hotové opakované úkoly + completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Ukončené ve zbytku tohoto měsíce completed_rest_of_previous_month: Uzavřeno ve zbytku minulého měsíce completed_rest_of_week: Dokončené ve zbytku týdne @@ -746,19 +859,18 @@ cs: confirm_delete: Opravdu chcete smazat úkol '%{description}'? context_changed: Kontext byl změněn na %{name} convert_to_project: Vytvořit projekt - deferred_actions_with: Odložené úkoly se štítkem '%{tag_name}' - deferred_pending_actions: Odložené/čekající úkoly - deferred_tasks_title: TRACKS::Tickler - defer_date_after_due_date: Datum zobrazení je až po plánovaném datu úkolu. Upravte - datum úkolu před dalším pokusem o odpložení zobrazení. + defer_date_after_due_date: Datum zobrazení je až po plánovaném datu úkolu. Upravte datum úkolu před dalším pokusem o odpložení zobrazení. defer_x_days: one: Ukázat zítra other: Ukázat za %{count} dní + deferred_actions_with: Odložené úkoly se štítkem '%{tag_name}' + deferred_pending_actions: Odložené/čekající úkoly + deferred_tasks_title: TRACKS::Tickler delete: Smazat - deleted_success: "Úkol byl úspěšně smazán." 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. depends_on: Závisí na depends_on_separate_with_commas: Závisí na (odděleno čárkami) done: Hotovo? @@ -768,6 +880,9 @@ cs: edit_action: Upravit úkol edit_action_with_description: Upravit úkol '%{description}' edit_recurring_todo: Upravit opakovaný úkol + error: + invalid_due_date: Invalid due date + invalid_show_from_date: Invalid show from date error_completing_todo: Nepodařilo se ukončit / aktivovat opakovaný úkol %{description} error_deleting_item: Nepodařilo se smazat položku %{description} error_deleting_recurring: Nepodařilo se smazat opakovaný úkol '%{description}' @@ -776,11 +891,11 @@ cs: error_starring: Nepodařilo se označit úkol hvězdičkou '%{description}' error_starring_recurring: Nebylo možno ohvězdičkovat opakovaný úkol '%{description}' error_toggle_complete: Nepodařilo se označit úkol jako hotový + feed_title_in_context: v kontextu '%{context}' + feed_title_in_project: v projektu '%{project}' feeds: completed: 'Hotové: %{date}' due: 'Plánováno na: %{date}' - feed_title_in_context: v kontextu '%{context}' - feed_title_in_project: v projektu '%{project}' has_x_pending: one: Jeden čekající úkol other: "%{count} čekajících úkolů" @@ -788,13 +903,14 @@ cs: 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 - úkolů + list_incomplete_next_actions_with_limit: Zobrazuje posledních %{count} nedokončených úkolů + mark_complete: Mark complete mobile_todos_page_title: Všechny úkoly - new_related_todo_created: Byl vytvořen nový úkol patřící do tohoto opakovaného - úkolu + 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:' next_actions_description_additions: completed: v posledních %{count} dnech @@ -810,13 +926,43 @@ cs: completed: hotové úkoly due_today: dnes due_within_a_week: během týdne - next_action_description: Popis úkolu - next_action_needed: Je potřeba zadat aspoň jeden úkol - no_actions_due_this_week: "Žádné úkoly plánovány na tento týden" - no_last_completed_actions: "Žádné hotové úkoly" + no_actions: + completed: Currently there are no completed actions + completed_recurring: Currently there are no completed recurring todos + completed_rest_of_month: No actions were completed in the rest of this month + completed_rest_of_week: No actions were completed in the rest of this week + completed_today: No actions were completed today + context: Currently there are no incomplete actions in this context + deferred_pending: Currently there are no deferred or pending actions + due_after_this_month: No actions due after this month + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_this_week: No actions due this week + due_today: No actions due today + hidden: Currently there are no hidden actions found + not_done: Currently there are no incomplete actions + not_done_context: Currently there are no incomplete actions in this context + not_done_project: Currently there are no incomplete actions in this project + not_done_with_tag: Currently there are no incomplete actions with the tag '%{param}' + project: Currently there are no incomplete actions in this project + recurring_todos: Currently there are no recurring todos + tag_hidden: Currently there are no hidden actions found + title: No actions found + without_project: Currently there are no actions without a project + no_actions_due_this_week: Žádné úkoly plánovány na tento týden + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with + no_last_completed_actions: Žádné hotové úkoly no_project: "--Žádný projekt--" + no_recurring_todos: No recurring todos + notes: Notes overdue: Spožděné úkoly - pending: "Čekající" + pending: Čekající recurrence: daily: Denně daily_every_number_day: Každých %{number} dní @@ -834,33 +980,35 @@ cs: day_names: - neděle - pondělí - - "úterý" + - úterý - středa - - "čtvrtek" + - čtvrtek - pátek - sobota due: plánováno na every_day: každý den every_month: každý měsíc every_n: každé %{n} + every_n_days: every %{n} days + every_n_months: every %{n} months 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" @@ -872,26 +1020,31 @@ cs: times: "(%{number} opakování)" until: do weekly: každý týden + recurrence_on: + due_date: set the actions due date + from_tickler: set the date the action should be shown (do not set a due date) + options: Use the calculated date to + show_always: always + show_days_before: not until %{days} days before the due date + show_options: Show the action starts_on: Začíná weekly: Týdně weekly_every_number_week: Každých %{number} týdnů weekly_options: Nastavení pro týdenní opakované úkoly yearly: Ročně - yearly_every_xth_day: "%{day} %{day_of_week} měsíce %{month}" yearly_every_x_day: Každý %{month} %{day} + 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_completed: Poslední opakování úkolu bylo označeno jako hotové. Opakovaný úkol je dokončený recurrence_period: Interval opakování - recurring_actions_title: TRACKS::Opakované úkoly - 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. recurring_pattern_removed: Vzor opakování byl odstraněn z %{count} recurring_todos: Opakované úkoly - removed_predecessor: Byl odstraněn %{successor} jako závislost pro %{predecessor}. remove_dependency: Odstranit závislost (nesmaže úkol) + 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í" @@ -904,39 +1057,37 @@ 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 - úkolu. Hodnota bude ignorována. Pokračovat? + unresolved_dependency: Hodnota v poli 'závisí na' neodpovídá žádnému existujícímu úkolu. Hodnota bude ignorována. Pokračovat? was_due_on_date: bylo plánováno na %{date} users: account_signup: Registrace uživatele + approve_tos: I approve the Terms of Service auth_change_submit: Změnit způsob přihlašování - auth_type_updated: Typ autentizace byl změněn. auth_type_update_error: 'Nepodařilo se změnit typ autentizace: %{error_messages}' - change_authentication_type: Změna způsobu přihlašování + auth_type_updated: Typ autentizace byl změněn. change_auth_type_title: TRACKS::Změna zůsobu autentizace - change_password_prompt: Pro změnu hesla zadejte nové hestlo do polí níže a stiskněte - 'Změna hesla'. + change_authentication_type: Změna způsobu přihlašování + change_password_prompt: Pro změnu hesla zadejte nové hestlo do polí níže a stiskněte 'Změna hesla'. change_password_submit: Změnit heslo change_password_title: TRACKS::Změna hesla choose_password: Zvolte heslo confirm_password: Potvrzení hesla desired_login: Uživatelské jméno - destroy_confirmation: 'Varování: tato akce smaže uživatele ''%{login}'', všechny - jeho úkoly, kontexty, projekty i poznámky. Opravdu chcete pokračovat?' + destroy_confirmation: 'Varování: tato akce smaže uživatele ''%{login}'', všechny jeho úkoly, kontexty, projekty i poznámky. Opravdu chcete pokračovat?' destroy_error: Nepodařilo se smazat uživatele %{login} destroy_successful: Uživatel %{login} byl úspěšně zničen destroy_user: Zničit uživatele + email_address: Email address failed_to_delete_user: Nepodařilo se smazat uživatele %{username} - first_user_heading: 'Vítejte v TRACKS. Nejdříve je nutné vytvořit administrátorský - účet:' + first_user_heading: 'Vítejte v TRACKS. Nejdříve je nutné vytvořit administrátorský účet:' + first_user_title: TRACKS::Sign up as the admin user identity_url: URL identity label_auth_type: Způsob autentizace manage_users: Správa uživatelů @@ -945,20 +1096,18 @@ cs: new_user_heading: 'Registrace nového uživatele:' new_user_title: TRACKS::Přihlášení jako administrátor no_signups_title: TRACKS::Registrace není povolena - openid_ok_pref_failed: Vaše identitní URL %{url} bylo úspěšně ověřeno, ale došlo - k problému při ukládání nastavení. - openid_url_verified: Identitní url %{url} bylo úspěšně ověřeno a nastavena autentizace - pomocí OpenID. + openid_ok_pref_failed: Vaše identitní URL %{url} bylo úspěšně ověřeno, ale došlo k problému při ukládání nastavení. + openid_url_verified: Identitní url %{url} bylo úspěšně ověřeno a nastavena autentizace pomocí OpenID. password_confirmation_label: Potvrzení hesla password_updated: Heslo bylo změněno. register_with_cas: S vaším uživatelským jménem z CASu - select_authentication_type: Vyberte nový způsob autentizace a stiskněte 'Změnit - způsob přihlašování'. + select_authentication_type: Vyberte nový způsob autentizace a stiskněte 'Změnit způsob přihlašování'. signup: Registrace 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" + tos_link: read the Terms of Service + total_actions: Úkolů celkem total_contexts: Kontextů celkem total_notes: Poznámek celkem total_projects: Projektů celkem @@ -969,15 +1118,14 @@ cs: next_label: další » page_entries_info: multi_page: Zobrazuji %{model} %{from} - %{to} o %{count} celkem - multi_page_html: Zobrazuji %{model} %{from} - %{to} of %{count} - celkem + multi_page_html: Zobrazuji %{model} %{from} - %{to} of %{count} celkem 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í 1 %{model} other: Zobrazení vše %{count} %{model} - zero: "Žádné %{model} nalézt" + zero: Žádné %{model} nalézt page_gap: "…" previous_label: "« předchozí" diff --git a/config/locales/de.yml b/config/locales/de.yml index 0139ae5a..03f03785 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -41,8 +41,14 @@ de: show_from: Zeige ab dem tags: Tags user: + auth_type: Auth type + display_name: Display name + email: Email address first_name: Vorname last_name: Nachname + login: Login + open_id_url: OpenID URL + password: Password errors: full_messages: format: "%{attribute} %{message}" @@ -62,6 +68,10 @@ de: less_than_or_equal_to: muss kleiner oder gleich %{count} sein not_a_number: ist keine Zahl odd: muss ungerade sein + record_invalid: 'Validation failed: %{errors}' + restrict_dependent_destroy: + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее taken: ist bereits vergeben too_long: ist zu lang (nicht mehr als %{count} Zeichen) too_short: ist zu kurz (nicht weniger als %{count} Zeichen) @@ -90,6 +100,7 @@ de: back: Zurück bugs: Bugs cancel: Abbrechen + collapse_expand: Collapse/expand context: Kontext contexts: Kontexte contribute: Mitwirken @@ -109,16 +120,17 @@ de: go_back: Zurück last: Letzte logout: Abmelden + mailing_list: Mailing List month: Monat months: Monate next: Nächste none: Keine + not_available_abbr: n/b note: one: 1 Notiz other: "%{count} Notizen" zero: keine Notizen notes: Notizen - not_available_abbr: n/b numbered_step: Schritt %{number} ok: Ok optional: optional @@ -126,20 +138,18 @@ 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. show_all: Alle anzeigen sort: alphabetically: Alphabetisch - alphabetically_confirm: Sollen diese Projekte wirklich alphabetisch sortiert - werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. + alphabetically_confirm: Sollen diese Projekte wirklich alphabetisch sortiert werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. alphabetically_title: Projekte alphabetisch sortieren by_task_count: Nach Anzahl der Aufgaben by_task_count_title: Nach Anzahl der Aufgaben sortieren - by_task_count_title_confirm: Sollen diese Projekte wirklich nach Anzahl der - Aufgaben sortiert werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. + by_task_count_title_confirm: Sollen diese Projekte wirklich nach Anzahl der Aufgaben sortiert werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. sort: Sortieren third: Dritte todo: Aufgabe @@ -150,14 +160,14 @@ de: wiki: Wiki contexts: add_context: Kontext hinzufügen - all_completed_tasks_title: 'TRACKS::Alle erledigten Aufgaben im Kontext ''%{context_name}''' - completed_tasks_title: 'TRACKS::Erledigte Aufgaben im Kontext ''%{context_name}''' + all_completed_tasks_title: TRACKS::Alle erledigten Aufgaben im Kontext '%{context_name}' + completed_tasks_title: TRACKS::Erledigte Aufgaben im Kontext '%{context_name}' context_deleted: Gelöschter Kontext '%{name}' context_hide: Auf Startseite ausblenden? context_name: Kontextname + context_state: Context state delete_context: Kontext löschen - delete_context_confirmation: Soll der Kontext '%{name}' wirklich gelöscht werden? - Alle (wiederkehrenden) Aufgaben dieses Kontexts werden hierdurch ebenfalls gelöscht. + delete_context_confirmation: Soll der Kontext '%{name}' wirklich gelöscht werden? Alle (wiederkehrenden) Aufgaben dieses Kontexts werden hierdurch ebenfalls gelöscht. delete_context_title: Kontext löschen edit_context: Kontext bearbeiten hidden_contexts: Versteckte Kontexte @@ -166,7 +176,9 @@ de: last_completed_in_context: in diesem Kontext (letzte %{number}) new_context_post: "' wird ebenfalls angelegt. Fortfahren?" new_context_pre: Der neue Kontext ' + no_contexts_: 'No contexts ' no_contexts_active: Derzeit gibt es keine aktiven Kontexte + no_contexts_closed: Currently there are no closed contexts no_contexts_hidden: Derzeit gibt es keine versteckten Kontexte save_status_message: Kontext gespeichert show_form: Neuen Kontext erstellen @@ -177,8 +189,10 @@ de: update_status_message: Kontextname wurde geändert visible_contexts: Sichtbare Kontexte data: + import_destination_invalid: Invalid import destination import_errors: Beim Import sind Fehler aufgetreten. import_successful: Import war erfolgreich. + invalid_import_destination: Invalid import destination date: abbr_day_names: - So @@ -281,8 +295,31 @@ de: second: Sekunden year: Jahr errors: - user_unauthorized: '401 Unauthorized: Nur administrative Benutzer dürfen auf diese - Funktion zugreifen.' + format: "%{attribute} %{message}" + messages: + accepted: должен быть подтвержден + blank: должна быть заполнена + confirmation: не соответствует %{attribute} + empty: не может быть пустым + equal_to: должно равняться %{count} + even: должно быть четным + exclusion: зарезервированно + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше или равно %{count} + inclusion: не входит в список + invalid: неверное + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + not_an_integer: должно быть целым числом + odd: должно быть нечетным + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято + too_long: 'слишком длинное (максимум: %{count} символов)' + too_short: 'слишком кроткое (минимум: %{count} символов)' + wrong_length: неверной длины (должно быть %{count} символов) + user_unauthorized: '401 Unauthorized: Nur administrative Benutzer dürfen auf diese Funktion zugreifen.' feedlist: actions_completed_last_week: In den letzten 7 Tagen erledigte Aufgaben actions_due_next_week: Nächste Woche fällige Aufgaben @@ -295,29 +332,35 @@ de: choose_context: Kontext für den Feed wählen choose_project: Projekt für den Feed wählen context_centric_actions: Feeds für unerledigte Aufgaben in einem bestimmten Kontext - context_needed: Es muss mindestens ein Kontext existieren, bevor ein Feed abonniert - werden kann. + context_needed: Es muss mindestens ein Kontext existieren, bevor ein Feed abonniert werden kann. ical_feed: iCal-Feed last_fixed_number: Die letzten %{number} Aufgaben legend: 'Legende:' - notice_incomplete_only: 'Hinweis: Alle Feeds zeigen nur Aufgaben, die noch nicht - als erledigt markiert wurden.' + notice_incomplete_only: 'Hinweis: Alle Feeds zeigen nur Aufgaben, die noch nicht als erledigt markiert wurden.' plain_text_feed: Reintext-Feed - projects_and_actions: Aktive Projekte und deren Aufgaben project_centric: Feeds für unerledigte Aufgaben in einem bestimmten Kontext - project_needed: Es muss mindestens ein Projekt existieren, bevor ein Feed abonniert - werden kann. + project_needed: Es muss mindestens ein Projekt existieren, bevor ein Feed abonniert werden kann. + projects_and_actions: Aktive Projekte und deren Aufgaben rss_feed: RSS-Feed select_feed_for_context: Feed für diesen Kontext auswählen select_feed_for_project: Feed für dieses Projekt auswählen footer: send_feedback: Senden Sie Feedback zu %{version} + helpers: + select: + prompt: Выберите + submit: + create: Создать %{model} + submit: Сохранить %{model} + update: Обновить %{model} integrations: opensearch_description: In Tracks suchen layouts: mobile_navigation: + calendar: Calendar contexts: Kontexte feeds: Feeds + full: Full Site home: Home logout: Abmelden new_action: Neu @@ -336,21 +379,32 @@ de: export_title: Daten importieren und exportieren feeds: Feeds feeds_title: Liste der verfügbaren Feeds anzeigen + group_view_by_context: Group by context + group_view_by_project: Group by project + group_view_by_title: Change the grouping of the actions on this page help: "?" + help_page: Help home: Start home_title: Start + import: Import + import_title: Import data integrations_: Tracks integrieren manage_users: Benutzer verwalten manage_users_title: Benutzer hinzufügen oder entfernen + mobile: Mobile Site notes_title: Alle Notizen anzeigen + options: Options organize: Organisieren preferences: Einstellungen preferences_title: Meine Einstellungen 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 + show_empty_containers_context: Show empty contexts + show_empty_containers_project: Show empty projects + show_empty_containers_title: Show or hide the empty projects or contexts starred: Markiert starred_title: Markierte Aufgaben betrachten stats: Statistiken @@ -365,28 +419,26 @@ 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. cas_signup_link: Account beantragen - cas_username_not_found: Sorry, aber es existiert kein Benutzer mit dem CAS-Benutzernamen - (%{username}) + cas_username_not_found: Sorry, aber es existiert kein Benutzer mit dem CAS-Benutzernamen (%{username}) + log_in_again: Erneut anmelden. logged_out: Sie wurden von Tracks abgemeldet. login_cas: zum CAS gehen login_standard: zurück zum Standard-Login login_with_openid: Mit einer OpenID anmelden - log_in_again: Erneut 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}) + openid_identity_url_not_found: Sorry, aber es existiert kein Benutzer mit der Identitäts-URL (%{identity_url}) option_separator: oder, please_login: Bitte melde dich an, um Tracks zu nutzen session_time_out: Sitzung abgelaufen. Bitte %{link} session_will_expire: Sitzung wird nach %{hours} Stunde(n) der Inaktivität ablaufen. session_will_not_expire: Sitzung wird nicht ablaufen. sign_in: Anmeldung + signup_prompt: Want to create an account? successful: Anmeldung erfolgreich. Willkommen zurück! successful_with_session_info: 'Anmeldung erfolgreich:' unsuccessful: Anmeldung war nicht erfolgreich. @@ -398,44 +450,62 @@ de: due_styles: - Fällig in ___ Tagen - Fällig am _______ + themes: + black: Black + light_blue: Light blue project: feed_description: Listet alle Projekte für %{username} auf feed_title: Tracks-Projekte todo: error_date_must_be_future: muss ein Datum in der Zukunft sein user: - error_context_not_associated: Kontext-ID %{context} nicht mit Benutzer-ID %{user} - verknüpft. - error_project_not_associated: Projekt-ID %{project} nicht mit User-ID %{user} - verknüpft. + error_context_not_associated: Kontext-ID %{context} nicht mit Benutzer-ID %{user} verknüpft. + error_project_not_associated: Projekt-ID %{project} nicht mit User-ID %{user} verknüpft. notes: - deleted_note: Notiz '%{id}' löschen delete_confirmation: Sind Sie sicher, dass Sie die Notiz '%{id}' löschen möchten? delete_item_title: Eintrag löschen delete_note_confirm: Soll die Notiz '%{id}' wirklich gelöscht werden? delete_note_title: Notiz '%{id}' löschen + deleted_note: Notiz '%{id}' löschen edit_item_title: Eintrag bearbeiten in_project: 'In:' + no_notes_available: Derzeit gibt es keine Notizen. Füge Notizen auf der jeweiligen Projektseite hinzu. note_header: Notiz %{id} note_link_title: Notiz %{id} anzeigen note_location_link: 'In:' - no_notes_available: Derzeit gibt es keine Notizen. Füge Notizen auf der jeweiligen - Projektseite hinzu. + save_status_message: Note %{id} was saved show_note_title: Notiz anzeigen number: currency: format: delimiter: "," format: "%n%u" + precision: '2' separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros unit: "€" format: delimiter: "." precision: 2 separator: "," + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros human: + decimal_units: + format: "%n %u" + units: + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион + unit: "." format: + delimiter: Delimiter precision: 1 + significant: 'true' + strip_insignificant_zeros: 'true' storage_units: format: "%n %u" units: @@ -446,23 +516,29 @@ de: kb: KB mb: MB tb: TB + percentage: + format: + delimiter: Delimiter + format: "%n%" + precision: + format: + delimiter: Delimiter 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 generate_new_token: Neues Token generieren - generate_new_token_confirm: Sind Sie sicher? Wenn Sie ein neues Token generieren, - wird dies das alte Token ersetzen und jegliche externe Nutzung stören, die das - alte Token verwendet. + generate_new_token_confirm: Sind Sie sicher? Wenn Sie ein neues Token generieren, wird dies das alte Token ersetzen und jegliche externe Nutzung stören, die das alte Token verwendet. is_false: Nein is_true: Ja open_id_url: 'Deine OpenID-URL lautet:' page_title: TRACKS::Einstellungen page_title_edit: TRACKS::Einstellungen ändern password_changed: Ihr Passwort geändert wurde, melden Sie sich bitte wieder an. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. show_number_completed: Zeige %{number} erledigte Einträge sms_context_none: Keine staleness_starts_after: Abgestandenheit startet nach %{days} Tagen @@ -470,6 +546,7 @@ de: authentication: Authentifizierung date_and_time: Datum und Uhrzeit profile: Profil + remove_account: Remove account tracks_behavior: Tracks Verhalten title: Deine Einstellungen token_description: Token (für die Verwendung in Feeds und der API) @@ -481,13 +558,17 @@ de: add_note: Notiz hinzufügen add_note_submit: Notiz hinzufügen add_project: Projekt hinzufügen - all_completed_tasks_title: 'TRACKS::Alle erledigten Aufgaben im Projekt ''%{project_name}''' + all_completed_tasks_title: TRACKS::Alle erledigten Aufgaben im Projekt '%{project_name}' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty completed_projects: Erledigte Projekte - completed_tasks_title: 'TRACKS::Liste erledigter Aufgaben in Project ''%{project_name}''' + completed_tasks_title: TRACKS::Liste erledigter Aufgaben in Project '%{project_name}' default_context: Der Standard-Kontext dieses Projektes ist %{context} default_context_removed: Standard-Kontext entfernt default_context_set: Standard-Kontext des Projekts auf %{default_context} gesetzt default_tags_removed_notice: Standard-Tags entfernt + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty delete_project: Projekt löschen delete_project_confirmation: Soll das Projekt '%{name}' wirklich gelöscht werden? delete_project_title: Projekt löschen @@ -497,21 +578,23 @@ de: hide_form: Fomular verstecken hide_form_title: Formular verstecken is_active: ist aktiv - list_completed_projects: 'TRACKS::Liste erledigter Projekte' + last_completed_in_project: "(last %{number})" + list_completed_projects: TRACKS::Liste erledigter Projekte list_projects: TRACKS::Projektliste list_reviews: TRACKS::Rückblick - notes: Notizen - notes_empty: Es gibt keine Notizen für dieses Projekt no_default_context: Dieses Projekt hat keinen Standard-Kontext no_last_completed_projects: Keine erledigten Projekte gefunden no_last_completed_recurring_todos: Keine erledigten wiederkehrenden Aufgaben gefunden no_notes_attached: Im Augenblick sind keine Notizen mit diesem Projekt verknüpft. no_projects: Keine Projekte vorhanden + notes: Notizen + notes_empty: Es gibt keine Notizen für dieses Projekt page_title: 'TRACKS::Projekt: %{project}' + project_destroyed_status: Deleted project '%{name}' project_saved_status: Projekt gespeichert project_state: Projekt ist %{state} - settings: Einstellungen set_default_tags_notice: Standard-Tags des Projekts auf %{default_tags} setzen + settings: Einstellungen show_form: Projekt erstellen show_form_title: Neues Projekt anlegen state: Dieses Projekt ist %{state} @@ -526,8 +609,8 @@ de: with_no_default_tags: und hat keine Standard-Tags search: contexts_matching_query: Kontexte entsprechen der Suche - notes_matching_query: Notizen entsprechen der Suche no_results: Die Suche ergab kein Ergebnis. + notes_matching_query: Notizen entsprechen der Suche projects_matching_query: Projekte entsprechen der Suche tags_matching_query: Tags entsprechen der Suche todos_matching_query: Todos entsprechen der Suche @@ -559,12 +642,29 @@ de: active_plural: Aktive blocked: Blockiert blocked_plural: Blockierte + close: Closed + closed_plural: Closed completed: Erledigte completed_plural: Erledigte + contexts: + ":": ":" + active: Active contexts + closed: Closed contexts + hidden: Hidden contexts current: Aktuell current_plural: Aktuelle hidden: Versteckt hidden_plural: Versteckte + projects: + ":": ":" + active: Active projects + blocked: Blocked + closed: Closed projects + completed: Completed + current: Current + hidden: Hidden projects + review: Review + stalled: Stalled review: Datiert review_plural: Verschobene stalled: Veraltet @@ -572,16 +672,15 @@ de: visible: Sichtbar visible_plural: Sichtbare stats: + action_completion_time_title: Fertigstellungszeit (alle erledigten Aufgaben) + action_selection_title: TRACKS::Aufgabenauswahl actions: Aufgaben actions_30days_title: _Aufgaben der letzten 30 Tage - actions_actions_avg_created_30days: In den letzten 30 Tagen haben Sie durchschnittlich - %{count} Aufgaben erstellt. + actions_actions_avg_created_30days: In den letzten 30 Tagen haben Sie durchschnittlich %{count} Aufgaben erstellt. actions_avg_completed: und davon durchschnittlich %{count} per Monat erledigt. actions_avg_completed_30days: und durchschnittlich %{count} davon erledigt. - actions_avg_completion_time: Durchschnittlich haben Sie %{count} Tage gebraucht - um eine Aufgabe zu erledigen. - actions_avg_created: In den letzten 12 Monaten haben Sie durchschnittlich %{count} - Aufgaben erstellt + actions_avg_completion_time: Durchschnittlich haben Sie %{count} Tage gebraucht um eine Aufgabe zu erledigen. + actions_avg_created: In den letzten 12 Monaten haben Sie durchschnittlich %{count} Aufgaben erstellt actions_day_of_week_legend: day_of_week: Tag der Woche number_of_actions: Anzahl der Aufgaben @@ -591,26 +690,20 @@ de: number_of_actions: Anzahl der Aufgaben actions_dow_30days_title: Wochentag (letzte 30 Tage) actions_further: und danach - actions_lastyear_title: Aufgaben der letzten 12 Monate actions_last_year: Aufgaben im letzten Jahr actions_last_year_legend: months_ago: Monate zuvor number_of_actions: Anzahl Aufgaben + actions_lastyear_title: Aufgaben der letzten 12 Monate actions_min_completion_time: Die minimale Zeit beträgt %{time}. - actions_min_max_completion_days: Das Minimum/Maximum in Tagen zur Erledigung ist - %{min}/%{max}. + actions_min_max_completion_days: Das Minimum/Maximum in Tagen zur Erledigung ist %{min}/%{max}. actions_selected_from_week: Aufgaben ausgewählt ab Woche - action_completion_time_title: Fertigstellungszeit (alle erledigten Aufgaben) - action_selection_title: TRACKS::Aufgabenauswahl click_to_return: Klick auf %{link} um zur Statistikseite zurückzukehren. click_to_return_link: hier - click_to_show_actions_from_week: Klick auf %{link} um die Aufgaben von Woche %{week} - und danach anzuzeigen. - click_to_update_actions: Klicke auf eine Leiste in der Grafik um die Aufgaben - unten zu aktualisieren. + click_to_show_actions_from_week: Klick auf %{link} um die Aufgaben von Woche %{week} und danach anzuzeigen. + click_to_update_actions: Klicke auf eine Leiste in der Grafik um die Aufgaben unten zu aktualisieren. contexts: Kontexte - current_running_time_of_incomplete_visible_actions: Aktuelle Laufzeit unerledigter - sichtbarer Aufgaben + current_running_time_of_incomplete_visible_actions: Aktuelle Laufzeit unerledigter sichtbarer Aufgaben index_title: TRACKS::Statistik labels: avg_completed: Durchschnittlich erledigt @@ -627,8 +720,7 @@ de: number_of_days: Anzahl vergangene Tage percentage: Prozentsatz running_time: Laufzeit einer Aufgabe (Wochen) - more_stats_will_appear: Weitere Statistiken werden verfügbar, wenn einige Aufgaben - hinzugefügt wurden. + more_stats_will_appear: Weitere Statistiken werden verfügbar, wenn einige Aufgaben hinzugefügt wurden. no_actions_selected: Es sind keine Aufgaben ausgewählt. no_tags_available: keine Tags verfügbar open_per_week: Aktiv (sichtbar und unsichtbar) nächsten Aufgaben pro Woche @@ -641,23 +733,18 @@ de: running_time_all_legend: actions: Aufgaben percentage: Prozentsatz - running_time: Laufzeit einer Aufgabe (Wochen). Klick auf eine Leiste für mehr - Informationen. + running_time: Laufzeit einer Aufgabe (Wochen). Klick auf eine Leiste für mehr Informationen. running_time_legend: actions: Aufgaben percentage: Prozentsatz - weeks: Vergangene Zeit einer Aufgabe (Wochen). Klicke auf eine Leiste für mehr - Informationen. + weeks: Vergangene Zeit einer Aufgabe (Wochen). Klicke auf eine Leiste für mehr Informationen. spread_of_actions_for_all_context: Aufgabenverteilung aller Kontexte - spread_of_running_actions_for_visible_contexts: Verteilung der laufenden Aufgaben - aller sichtbaren Kontexte - tags: Tags - tag_cloud_90days_description: Diese Tag-Cloud beinhaltet Tags der Aufgaben, die - in den letzten 90 Tagen erstellt oder erledigt wurden. + spread_of_running_actions_for_visible_contexts: Verteilung der laufenden Aufgaben aller sichtbaren Kontexte + tag_cloud_90days_description: Diese Tag-Cloud beinhaltet Tags der Aufgaben, die in den letzten 90 Tagen erstellt oder erledigt wurden. tag_cloud_90days_title: Tag-Cloud-Aufgaben in den letzten 90 Tagen - tag_cloud_description: Diese Tag-Cloud beinhaltet Tags aller Aufgaben (erledigt, - unerledigt, sichtbar, unsichtbar) + tag_cloud_description: Diese Tag-Cloud beinhaltet Tags aller Aufgaben (erledigt, unerledigt, sichtbar, unsichtbar) tag_cloud_title: Tag-Cloud aller Aufgaben + tags: Tags time_of_day: Tageszeit (alle Aufgaben) time_of_day_legend: number_of_actions: Anzahl Aufgaben @@ -670,11 +757,10 @@ de: top10_projects: Top 10 aller Projekte top10_projects_30days: Top-10-Projekt der letzten 30 Tage top5_contexts: Top 5 aller Kontexte - top5_visible_contexts_with_incomplete_actions: Top 5 der sichtbaren Kontexte mit - unerledigten Aufgaben + top5_visible_contexts_with_incomplete_actions: Top 5 der sichtbaren Kontexte mit unerledigten Aufgaben totals: Ingesamt - totals_actions_completed: "%{count} davon sind erledigt." totals_action_count: hatten Sie insgesamt %{count} Aufgaben + 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_completed_project_count: und %{count} sind erledigte Projekte. @@ -707,73 +793,84 @@ de: time: "%H:%M" pm: nachmittags todos: + action_deferred: The action '%{description}' was deferred 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_marked_complete: Die Aufgabe '%{description}' wurde als - %{completed} markiert. - action_marked_complete_error: Die Aufgabe '%{description}' wurde - aufgrund eines Fehlers NICHT als %{completed} markiert. + action_marked_complete: Die Aufgabe '%{description}' wurde als %{completed} markiert. + action_marked_complete_error: Die Aufgabe '%{description}' wurde aufgrund eines Fehlers NICHT als %{completed} markiert. action_saved: Aufgabe gespeichert action_saved_to_tickler: Aufgabe im Notizbuch gespeichert + actions: + completed: Completed actions + context_completed: Completed actions in this context + context_deferred_pending: Deferred/pending actions in this context + context_without_project: Actions without project in %{param} + home_completed: Completed actions + home_without_project: Actions without project + project_completed: Completed actions in this project + project_deferred_pending: Deferred/pending actions in this project + project_project: Actions in this project + tag_completed: Completed actions tagged with '%{param}' + tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_hidden: Hidden actions tagged with '%{param}' + add_another_dependency: Neue Abhängigkeit + add_new_recurring: Neue wiederkehrende Aufgabe 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 added_new_next_action_singular: Neue nächste Aufgabe angelegt added_new_project: Neues Projekt hinzugefügt - add_another_dependency: Neue Abhängigkeit - add_new_recurring: Neue wiederkehrende Aufgabe all_completed: Alle erledigten Aufgaben all_completed_here: hier - all_completed_tagged_page_title: 'TRACKS::Alle erledigten Aufgaben mit Tag %{tag_name}' + all_completed_tagged_page_title: TRACKS::Alle erledigten Aufgaben mit Tag %{tag_name} append_in_this_project: in diesem Projekt archived_tasks_title: TRACKS::Archivierte erledigte Aufgaben blocked_by: Blockiert durch %{predecessors} calendar: + due_after_this_month: Due in %{next_month} and later due_next_week: Nächste Woche fällig due_this_month: Im %{month} fällig due_this_week: Diese Woche fällig due_today: Heute fällig get_in_ical_format: Diesen Kalender im iCal Format herunterladen calendar_page_title: TRACKS::Kalender - cannot_add_dependency_to_completed_todo: Kann keine Abhängigkeit zu einer erledigten - Aufgabe hinzufügen! + cannot_add_dependency_to_completed_todo: Kann keine Abhängigkeit zu einer erledigten Aufgabe hinzufügen! clear_due_date: Fälligkeitsdatum leeren clear_show_from_date: Datum leeren completed: Erledigt + completed_actions: Completed actions completed_actions_with: Erledigte Aufgaben mit dem Tag %{tag_name} completed_in_archive: one: Es befindet sich eine erledigte Aufgabe im Archiv. other: Es befinden sich %{count} erledigte Aufgaben im Archiv. completed_last_day: In den letzten 24 Stunden erledigt completed_last_x_days: In den letzten %{count} Tagen erledigt - completed_recurrence_completed: Es gibt keine weitere Aufgabe nach der soeben - gelöschten. Die Wiederholung ist abgeschlossen. + completed_recurrence_completed: Es gibt keine weitere Aufgabe nach der soeben gelöschten. Die Wiederholung ist abgeschlossen. completed_recurring: Erledigte wiederkehrende Aufgaben + completed_recurring_actions_title: TRACKS::Erledigte wiederkehrende Aufgaben completed_rest_of_month: Erledigt diesen Monat completed_rest_of_previous_month: Erledigt im Vormonat completed_rest_of_week: Erledigt diese Woche - completed_tagged_page_title: 'TRACKS::Erledigte Aufgaben mit Tag %{tag_name}' + 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 - deferred_actions_with: Zurückgestellte Aufgaben mit dem Tag '%{tag_name}' - deferred_pending_actions: Aufgeschobene und ausstehende Aufgaben - deferred_tasks_title: TRACKS::Notizbuch - defer_date_after_due_date: Zurückstellungsdatum nach Ablaufdatum. Bitte passe - das Ablaufdatum an, dass es vor dem Zurückstellungsdatum liegt. + 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" + deferred_actions_with: Zurückgestellte Aufgaben mit dem Tag '%{tag_name}' + deferred_pending_actions: Aufgeschobene und ausstehende Aufgaben + deferred_tasks_title: TRACKS::Notizbuch delete: Löschen - deleted_success: Die Aufgabe wurde erfolgreich gelöscht. delete_action: Aufgabe löschen - delete_recurring_action_confirm: Soll die wiederkehrende Aufgabe '%{description}' - wirklich gelöscht werden? + delete_recurring_action_confirm: Soll die wiederkehrende Aufgabe '%{description}' wirklich gelöscht werden? + delete_recurring_action_title: Delete the recurring action + deleted_success: Die Aufgabe wurde erfolgreich gelöscht. depends_on: Hängt ab von depends_on_separate_with_commas: Hängt ab von (kommagetrennt) done: Erledigt? @@ -783,23 +880,22 @@ de: edit_action: Aufgabe bearbeiten edit_action_with_description: Aufgabe '%{description}' bearbeiten edit_recurring_todo: Wiederkehrende Aufgabe bearbeiten - error_completing_todo: Beim Abschließen/Aktivieren der wiederkehrenden Aufgabe - %{description} ist ein Fehler aufgetreten + error: + invalid_due_date: Invalid due date + invalid_show_from_date: Invalid show from date + error_completing_todo: Beim Abschließen/Aktivieren der wiederkehrenden Aufgabe %{description} ist ein Fehler aufgetreten error_deleting_item: Beim Löschen von %{description} trat ein Fehler auf - error_deleting_recurring: Beim Löschen der wiederkehrenden Aufgabe %{description} - ist ein Fehler aufgetreten + error_deleting_recurring: Beim Löschen der wiederkehrenden Aufgabe %{description} ist ein Fehler aufgetreten error_removing_dependency: Beim Entfernen der Abhängigkeit ist ein Fehler aufgetreten - error_saving_recurring: Es gab einen Fehler beim Speichern der wiederkehrenden - Aufgabe '%{description}' + error_saving_recurring: Es gab einen Fehler beim Speichern der wiederkehrenden Aufgabe '%{description}' error_starring: Konnte die Hervorhebung von '%{description}' nicht durchführen - error_starring_recurring: Konnte die Hervorhebung der wiederkehrenden Aufgabe - '%{description}' nicht durchführen + error_starring_recurring: Konnte die Hervorhebung der wiederkehrenden Aufgabe '%{description}' nicht durchführen error_toggle_complete: Könnte nicht diese Marke todo komplett + feed_title_in_context: im Kontext '%{context}' + feed_title_in_project: im Projekt '%{project}' feeds: completed: 'Erledigt: %{date}' due: 'Fällig: %{date}' - feed_title_in_context: im Kontext '%{context}' - feed_title_in_project: im Projekt '%{project}' has_x_pending: one: Hat eine ausstehende Aufgabe other: Hat %{count} ausstehende Aufgaben @@ -807,13 +903,14 @@ de: in_hidden_state: als versteckt markiert in_pending_state: und als ausstehend markiert list_incomplete_next_actions: Unerledigte Folge-Aufgaben anzeigen - list_incomplete_next_actions_with_limit: Zeige die letzten %{count} unerledigten - Folge-Aufgaben + list_incomplete_next_actions_with_limit: Zeige die letzten %{count} unerledigten Folge-Aufgaben + mark_complete: Mark complete mobile_todos_page_title: Alle Aufgaben - new_related_todo_created: Eine neue Aufgabe wurde hinzugefügt, die zu dieser wiederkehrenden - Aufgabe gehört + new_related_todo_created: Eine neue Aufgabe wurde hinzugefügt, die zu dieser wiederkehrenden Aufgabe gehört new_related_todo_created_short: hat eine neue Aufgabe new_related_todo_not_created_short: konnte nicht erstellt werden + next_action_description: Beschreibung der nächsten Aufgabe + next_action_needed: Es muss mindestens eine folgende Aufgabe angelegt werden next_actions_description: 'Filter:' next_actions_description_additions: completed: In den letzten %{count} Tagen @@ -822,19 +919,49 @@ 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 due_today: heute fällig due_within_a_week: diese Woche fällig - next_action_description: Beschreibung der nächsten Aufgabe - next_action_needed: Es muss mindestens eine folgende Aufgabe angelegt werden + no_actions: + completed: Currently there are no completed actions + completed_recurring: Currently there are no completed recurring todos + completed_rest_of_month: No actions were completed in the rest of this month + completed_rest_of_week: No actions were completed in the rest of this week + completed_today: No actions were completed today + context: Currently there are no incomplete actions in this context + deferred_pending: Currently there are no deferred or pending actions + due_after_this_month: No actions due after this month + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_this_week: No actions due this week + due_today: No actions due today + hidden: Currently there are no hidden actions found + not_done: Currently there are no incomplete actions + not_done_context: Currently there are no incomplete actions in this context + not_done_project: Currently there are no incomplete actions in this project + not_done_with_tag: Currently there are no incomplete actions with the tag '%{param}' + project: Currently there are no incomplete actions in this project + recurring_todos: Currently there are no recurring todos + tag_hidden: Currently there are no hidden actions found + title: No actions found + without_project: Currently there are no actions without a project no_actions_due_this_week: Keine fälligen Aufgaben diese Woche + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with no_last_completed_actions: Keine erledigten Aufgaben gefunden no_project: "--Kein Projekt--" - overdue: "überfällig" + no_recurring_todos: No recurring todos + notes: Notes + overdue: überfällig pending: Ausstehend recurrence: daily: Täglich @@ -862,6 +989,8 @@ de: every_day: jeden Tag every_month: jeden Monat every_n: jeden %{n} + every_n_days: every %{n} days + every_n_months: every %{n} months every_xth_day_of_every_n_months: jedes %{x} %{day} jedes %{n_months} ? every_year_on: jedes Jahr in %{date} first: erste @@ -891,26 +1020,31 @@ de: times: für %{number} Zeiten until: bis weekly: wöchentlich + recurrence_on: + due_date: set the actions due date + from_tickler: set the date the action should be shown (do not set a due date) + options: Use the calculated date to + show_always: always + show_days_before: not until %{days} days before the due date + show_options: Show the action starts_on: Beginnt am weekly: Wöchentlich weekly_every_number_week: Kehrt jede %{number}. Woche wieder am weekly_options: Einstellungen wöchentliche Aufgaben yearly: Jährlich - yearly_every_xth_day: Den %{day} %{day_of_week} des %{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 - mehr. Die Wiederholung endet hiermit. + recurrence_completed: Nach dieser erledigten wiederkehrenden Aufgabe folgt keine mehr. Die Wiederholung endet hiermit. recurrence_period: Wiederholungszeitraum - recurring_actions_title: TRACKS::Wiederkehrende Aufgaben - recurring_action_deleted: Die Aufgabe wurde gelöscht. Da dies eine wiederkehrende - Aufgabe ist, wurde eine neue erstellt. + recurring_action_deleted: Die Aufgabe wurde gelöscht. Da dies eine wiederkehrende Aufgabe ist, wurde eine neue erstellt. recurring_action_saved: Wiederkehrende Aufgabe gespeichert + recurring_actions_title: TRACKS::Wiederkehrende Aufgaben recurring_deleted_success: Die wiederkehrende Aufgabe wurde erfolgreich gelöscht. recurring_pattern_removed: Das Wiederholungsmuster wurde entfernt %{count} recurring_todos: Wiederkehrende Aufgaben - removed_predecessor: "%{successor} entfernt als Abhängigkeit von %{predecessor}." remove_dependency: Abhängigkeit löschen (löscht nicht die Aufgabe) + 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" @@ -927,40 +1061,33 @@ 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." + 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 - completed_recurring_actions_title: 'TRACKS::Erledigte wiederkehrende Aufgaben' users: account_signup: Accounteinrichtung + approve_tos: I approve the Terms of Service auth_change_submit: Authentifizierungsart ändern + auth_type_update_error: 'Beim ändern der Authentifizierung trat ein Fehler auf: %{error_messages}' auth_type_updated: Authentifizierungs-Art erfolgreich geändert. - auth_type_update_error: 'Beim ändern der Authentifizierung trat ein Fehler auf: - %{error_messages}' - change_authentication_type: Authentifizierungsart ändern change_auth_type_title: TRACKS::Authentifizierungstyp ändern - change_password_prompt: Gib dein neues Passwort in die unten stehenden Felder - ein und klicke auf 'Passwort ändern' um dein altes Passwort durch das neue zu - ersetzen. + change_authentication_type: Authentifizierungsart ändern + change_password_prompt: Gib dein neues Passwort in die unten stehenden Felder ein und klicke auf 'Passwort ändern' um dein altes Passwort durch das neue zu ersetzen. change_password_submit: Passwort ändern change_password_title: TRACKS::Passwort ändern choose_password: Passwort wählen confirm_password: Passwort bestätigen desired_login: Gewünschter Benutzername - destroy_confirmation: 'Achtung: der Benutzer ''%{login}'' wird mit all seinen - Aufgaben, Kontexten, Projekten und Notizen gelöscht. Sind Sie sicher, dass Sie - fortfahren möchten?' + destroy_confirmation: 'Achtung: der Benutzer ''%{login}'' wird mit all seinen Aufgaben, Kontexten, Projekten und Notizen gelöscht. Sind Sie sicher, dass Sie fortfahren möchten?' destroy_error: Beim Löschen des Benutzers %{login} ist ein Fehler aufgetreten. destroy_successful: Benutzer %{login} wurde erfolgreich gelöscht destroy_user: Benutzer löschen + email_address: Email address failed_to_delete_user: Löschen des Benutzers %{username} fehlgeschlagen - first_user_heading: 'Willkommen bei TRACKS. Als erstes legen Sie bitte einen Administrator-Zugang - an:' + first_user_heading: 'Willkommen bei TRACKS. Als erstes legen Sie bitte einen Administrator-Zugang an:' + first_user_title: TRACKS::Sign up as the admin user identity_url: Identity-URL label_auth_type: Authentifizierungsart manage_users: Benutzer verwalten @@ -969,19 +1096,17 @@ de: new_user_heading: 'Einen neuen Benutzer anlegen:' new_user_title: TRACKS::Als Administrator anmelden no_signups_title: TRACKS::Anmeldung nicht erlaubt - openid_ok_pref_failed: Die URL %{url} wurde erfolgreich als Identität verifiziert, - beim Speichern der Einstellungen trat jedoch ein Fehler auf. - openid_url_verified: Die URL %{url} wurde erfolgreich als Identität verifiziert - und Deine Authentifizierung auf OpenID umgestellt. + openid_ok_pref_failed: Die URL %{url} wurde erfolgreich als Identität verifiziert, beim Speichern der Einstellungen trat jedoch ein Fehler auf. + openid_url_verified: Die URL %{url} wurde erfolgreich als Identität verifiziert und Deine Authentifizierung auf OpenID umgestellt. password_confirmation_label: Passwort bestätigen password_updated: Passwort aktualisiert. register_with_cas: Mit deinem CAS-Benutzernamen - select_authentication_type: Wähle deine neue Authentifizierungsart und klicke - 'Authentifizierungsart ändern' an, um deine aktuellen Einstellungen zu überschreiben. + select_authentication_type: Wähle deine neue Authentifizierungsart und klicke 'Authentifizierungsart ändern' an, um deine aktuellen Einstellungen zu überschreiben. signup: Registrieren signup_new_user: Neuen Benutzer anlegen signup_successful: Benutzer %{username} erfolgreich angelegt. successfully_deleted_user: Benutzer %{username} erfolgreich gelöscht. + tos_link: read the Terms of Service total_actions: Alle Aufgaben total_contexts: Alle Kontexte total_notes: Alle Notizen @@ -993,8 +1118,7 @@ de: next_label: Nächste » page_entries_info: multi_page: Angezeigte %{model} %{from} - %{to} von %{count} insgesamt - multi_page_html: Angezeigte %{model} %{from} - %{to} von %{count} - insgesamt + multi_page_html: Angezeigte %{model} %{from} - %{to} von %{count} insgesamt single_page: one: Angezeigte 1 %{model} other: Anzeige aller %{count} %{model} diff --git a/config/locales/en.yml b/config/locales/en.yml index 7555540c..4f0a1de9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,52 +1,44 @@ --- en: - number: - format: - separator: . - precision: 3 - delimiter: "," - human: - format: - precision: 1 - delimiter: "" - storage_units: - format: "%n %u" - units: - kb: KB - tb: TB - gb: GB - byte: - one: Byte - other: Bytes - mb: MB - percentage: - format: - delimiter: "" - currency: - format: - format: "%u%n" - unit: $ - separator: . - precision: 2 - delimiter: "," - precision: - format: - delimiter: "" activerecord: attributes: + note: + created_at: Created at + updated_at: Updated at + preference: + date_format: Date format + due_style: Due style + first_name: First name + last_name: Last name + locale: Locale + mobile_todos_per_page: Actions per page (Mobile View) + refresh: Refresh interval (in minutes) + review_period: Project review interval + show_completed_projects_in_sidebar: Show completed projects in sidebar + show_hidden_contexts_in_sidebar: Show hidden contexts in sidebar + show_hidden_projects_in_sidebar: Show hidden projects in sidebar + show_number_completed: Show number of completed actions + show_project_on_todo_done: Go to project page on completing todo + sms_context: Default email context + sms_email: From email + staleness_starts: Start of staleness + time_zone: Time zone + title_date_format: Title date format + verbose_action_descriptors: Show descriptors (context, project) of actions in a verbose form + week_starts: Week starts on project: - name: Name - default_tags: Default Tags default_context_name: Default context + default_tags: Default Tags description: Description + name: Name todo: - predecessors: Depends on - show_from: Show from - notes: Notes - project: Project context: Context description: Description due: Due + notes: Notes + predecessors: Depends on + project: Project + show_from: Show from tags: Tags user: auth_type: Auth type @@ -57,154 +49,151 @@ en: login: Login open_id_url: OpenID URL password: Password - preference: - show_hidden_projects_in_sidebar: Show hidden projects in sidebar - date_format: Date format - show_hidden_contexts_in_sidebar: Show hidden contexts in sidebar - mobile_todos_per_page: Actions per page (Mobile View) - verbose_action_descriptors: Show descriptors (context, project) of actions in a verbose form - staleness_starts: Start of staleness - review_period: Project review interval - sms_context: Default email context - title_date_format: Title date format - show_number_completed: Show number of completed actions - refresh: Refresh interval (in minutes) - week_starts: Week starts on - last_name: Last name - locale: Locale - due_style: Due style - time_zone: Time zone - show_project_on_todo_done: Go to project page on completing todo - sms_email: From email - first_name: First name - show_completed_projects_in_sidebar: Show completed projects in sidebar - note: - created_at: Created at - updated_at: Updated at errors: + full_messages: + format: "%{attribute} %{message}" messages: - greater_than_or_equal_to: must be greater than or equal to %{count} - record_invalid: "Validation failed: %{errors}" - confirmation: doesn't match confirmation - less_than_or_equal_to: must be less than or equal to %{count} - blank: can't be blank - invalid: "is not valid" - exclusion: is reserved - odd: must be odd - even: must be even - too_short: is too short (minimum is %{count} characters) - empty: can't be empty - wrong_length: is the wrong length (should be %{count} characters) - less_than: must be less than %{count} - greater_than: must be greater than %{count} - equal_to: must be equal to %{count} accepted: must be accepted - too_long: is too long (maximum is %{count} characters) - taken: has already been taken + blank: can't be blank + confirmation: doesn't match confirmation + empty: can't be empty + equal_to: must be equal to %{count} + even: must be even + exclusion: is reserved + greater_than: must be greater than %{count} + greater_than_or_equal_to: must be greater than or equal to %{count} inclusion: is not included in the list + invalid: is not valid + less_than: must be less than %{count} + less_than_or_equal_to: must be less than or equal to %{count} not_a_number: is not a number + odd: must be odd + record_invalid: 'Validation failed: %{errors}' + restrict_dependent_destroy: + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее + taken: has already been taken + too_long: is too long (maximum is %{count} characters) + too_short: is too short (minimum is %{count} characters) + wrong_length: is the wrong length (should be %{count} characters) models: project: attributes: name: blank: project must have a name - too_long: project name must be less than 256 characters taken: already exists - full_messages: - format: "%{attribute} %{message}" + too_long: project name must be less than 256 characters template: - body: "There were problems with the following fields:" + body: 'There were problems with the following fields:' header: one: 1 error prohibited this %{model} from being saved other: "%{count} errors prohibited this %{model} from being saved" - models: - project: - feed_title: Tracks Projects - feed_description: Lists all the projects for %{username} - todo: - error_date_must_be_future: must be a date in the future - user: - error_context_not_associated: Context id %{context} not associated with user id %{user}. - error_project_not_associated: Project id %{project} not associated with user id %{user}. - preference: - due_on: Due on %{date} - due_in: Due in %{days} days - due_styles: - - Due in ___ days - - Due on _______ - themes: - black: Black - light_blue: Light blue - datetime: - prompts: - minute: Minute - second: Seconds - month: Month - hour: Hour - day: Day - year: Year - distance_in_words: - less_than_x_minutes: - one: less than a minute - other: less than %{count} minutes - zero: less than 1 minute - x_days: - one: 1 day - other: "%{count} days" - almost_x_years: - one: almost 1 year - other: almost %{count} years - x_seconds: - one: 1 second - other: "%{count} seconds" - about_x_hours: - one: about 1 hour - other: about %{count} hours - less_than_x_seconds: - one: less than 1 second - other: less than %{count} seconds - zero: less than 1 second - x_months: - one: 1 month - other: "%{count} months" - x_minutes: - one: 1 minute - other: "%{count} minutes" - about_x_years: - one: about 1 year - other: about %{count} years - about_x_months: - one: about 1 month - other: about %{count} months - over_x_years: - one: over 1 year - other: over %{count} years - half_a_minute: half a minute - time: - am: am - formats: - default: "%a, %d %b %Y %H:%M:%S %z" - time: "" - short: "%d %b %H:%M" - month_day: "%B %d" - long: "%B %d, %Y %H:%M" - stats: "%a %d-%m" - pm: pm + common: + action: Action + actions: Actions + actions_midsentence: + one: action + other: actions + zero: actions + add: Add + ajaxError: There was an error retrieving from server + back: Back + bugs: Bugs + cancel: Cancel + collapse_expand: Collapse/expand + context: Context + contexts: Contexts + contribute: Contribute + create: Create + days_midsentence: + one: day + other: days + zero: days + deferred: deferred + description: Description + drag_handle: DRAG + email: Email + errors_with_fields: 'There were problems with the following fields:' + first: First + forth: Forth + fourth: Fourth + go_back: Go back + last: Last + logout: Logout + mailing_list: Mailing List + month: month + months: months + next: Next + none: None + not_available_abbr: n/a + note: + one: 1 note + other: "%{count} notes" + zero: no notes + notes: Notes + numbered_step: Step %{number} + ok: Ok + optional: optional + previous: Previous + project: Project + projects: Projects + recurring_todos: Recurring Actions + review: Review + search: Search + second: Second + server_error: An error occurred on the server. + show_all: Show all + sort: + alphabetically: Alphabetically + alphabetically_confirm: Are you sure that you want to sort these projects alphabetically? This will replace the existing sort order. + alphabetically_title: Sort projects alphabetically + by_task_count: By number of tasks + by_task_count_title: Sort by number of tasks + by_task_count_title_confirm: Are you sure that you want to sort these projects by the number of tasks? This will replace the existing sort order. + sort: Sort + third: Third + todo: todo + update: Update + website: Website + week: week + weeks: weeks + wiki: Wiki + contexts: + add_context: Add Context + all_completed_tasks_title: TRACKS::All Completed actions in the context '%{context_name}' + completed_tasks_title: TRACKS::Completed actions in the context '%{context_name}' + context_deleted: Deleted context '%{name}' + context_hide: Hide from front page? + context_name: Context name + context_state: Context state + delete_context: Delete context + delete_context_confirmation: Are you sure that you want to delete the context '%{name}'? Be aware that this will also delete all (recurring) actions in this context! + delete_context_title: Delete context + edit_context: Edit context + hidden_contexts: Hidden contexts + hide_form: Hide form + hide_form_title: Hide new context form + last_completed_in_context: "(last %{number})" + new_context_post: "' will be also created. Are you sure?" + new_context_pre: New context ' + no_contexts_: 'No contexts ' + no_contexts_active: Currently there are no active contexts + no_contexts_closed: Currently there are no closed contexts + no_contexts_hidden: Currently there are no hidden contexts + save_status_message: Context saved + show_form: Create a new context + show_form_title: Add a context + status_active: Context is active + status_hidden: Context is hidden + todos_append: in this context + update_status_message: Name of context was changed + visible_contexts: Visible contexts + data: + import_destination_invalid: Invalid import destination + import_errors: Some errors occurred during import + import_successful: Import was successful. + invalid_import_destination: Invalid import destination date: - month_names: - - - - January - - February - - March - - April - - May - - June - - July - - August - - September - - October - - November - - December abbr_day_names: - Sun - Mon @@ -213,27 +202,8 @@ en: - Thu - Fri - Sat - order: - - :year - - :month - - :day - formats: - only_day: "" - default: "%Y-%m-%d" - short: "%b %d" - month_day: "" - long: "%B %d, %Y" - longer: "%A %B %d, %Y" - day_names: - - Sunday - - Monday - - Tuesday - - Wednesday - - Thursday - - Friday - - Saturday abbr_month_names: - - + - - Jan - Feb - Mar @@ -246,107 +216,447 @@ en: - Oct - Nov - Dec - support: - array: - words_connector: ", " - last_word_connector: ", and " - two_words_connector: " and " - select: - prompt: Please select + day_names: + - Sunday + - Monday + - Tuesday + - Wednesday + - Thursday + - Friday + - Saturday + formats: + default: "%Y-%m-%d" + long: "%B %d, %Y" + longer: "%A %B %d, %Y" + month_day: '' + only_day: '' + short: "%b %d" + month_names: + - + - January + - February + - March + - April + - May + - June + - July + - August + - September + - October + - November + - December + order: + - :year + - :month + - :day + datetime: + distance_in_words: + about_x_hours: + one: about 1 hour + other: about %{count} hours + about_x_months: + one: about 1 month + other: about %{count} months + about_x_years: + one: about 1 year + other: about %{count} years + almost_x_years: + one: almost 1 year + other: almost %{count} years + half_a_minute: half a minute + less_than_x_minutes: + one: less than a minute + other: less than %{count} minutes + zero: less than 1 minute + less_than_x_seconds: + one: less than 1 second + other: less than %{count} seconds + zero: less than 1 second + over_x_years: + one: over 1 year + other: over %{count} years + x_days: + one: 1 day + other: "%{count} days" + x_minutes: + one: 1 minute + other: "%{count} minutes" + x_months: + one: 1 month + other: "%{count} months" + x_seconds: + one: 1 second + other: "%{count} seconds" + prompts: + day: Day + hour: Hour + minute: Minute + month: Month + second: Seconds + year: Year errors: - user_unauthorized: "401 Unauthorized: Only administrative users are allowed access to this function." - common: - back: Back - third: Third - recurring_todos: Recurring Actions - actions: Actions - actions_midsentence: - zero: actions - one: action - other: actions - add: Add - previous: Previous - show_all: Show all - logout: Logout - go_back: Go back - optional: optional - week: week - cancel: Cancel - none: None - second: Second - month: month - server_error: An error occurred on the server. - notes: Notes - review: Review - last: Last - projects: Projects - action: Action - project: Project - ok: Ok - contribute: Contribute - website: Website - first: First - numbered_step: Step %{number} - sort: - by_task_count_title: Sort by number of tasks - by_task_count_title_confirm: Are you sure that you want to sort these projects by the number of tasks? This will replace the existing sort order. - alphabetically: Alphabetically - alphabetically_confirm: Are you sure that you want to sort these projects alphabetically? This will replace the existing sort order. - alphabetically_title: Sort projects alphabetically - sort: Sort - by_task_count: By number of tasks - fourth: Fourth - create: Create - months: months - contexts: Contexts - errors_with_fields: "There were problems with the following fields:" - next: Next - todo: todo - note: - zero: "no notes" - one: "1 note" - other: "%{count} notes" - context: Context - drag_handle: DRAG - description: Description - bugs: Bugs - update: Update - forth: Forth - weeks: weeks - wiki: Wiki - email: Email - mailing_list: Mailing List - search: Search - ajaxError: There was an error retrieving from server - days_midsentence: - zero: days - one: day - other: days - deferred: deferred - not_available_abbr: "n/a" - collapse_expand: Collapse/expand - shared: - multiple_next_actions: Multiple next actions (one on each line) + format: "%{attribute} %{message}" + messages: + accepted: должен быть подтвержден + blank: должна быть заполнена + confirmation: не соответствует %{attribute} + empty: не может быть пустым + equal_to: должно равняться %{count} + even: должно быть четным + exclusion: зарезервированно + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше или равно %{count} + inclusion: не входит в список + invalid: неверное + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + not_an_integer: должно быть целым числом + odd: должно быть нечетным + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято + too_long: 'слишком длинное (максимум: %{count} символов)' + too_short: 'слишком кроткое (минимум: %{count} символов)' + wrong_length: неверной длины (должно быть %{count} символов) + user_unauthorized: '401 Unauthorized: Only administrative users are allowed access to this function.' + feedlist: + actions_completed_last_week: Actions completed in the last 7 days + actions_due_next_week: Actions due in 7 days or earlier + actions_due_today: Actions due today or earlier + active_projects_wo_next: Active projects with no next actions + active_starred_actions: All starred, active actions + all_actions: All actions + all_contexts: All Contexts + all_projects: All Projects + choose_context: Choose the context you want a feed of + choose_project: Choose the project you want a feed of + context_centric_actions: Feeds for incomplete actions in a specific context + context_needed: There needs to be at least one context before you can request a feed + ical_feed: iCal feed + last_fixed_number: Last %{number} actions + legend: 'Legend:' + notice_incomplete_only: 'Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page' + plain_text_feed: Plain Text Feed + project_centric: Feeds for incomplete actions in a specific project + project_needed: There needs to be at least one project before you can request a feed + projects_and_actions: Active projects with their actions + rss_feed: RSS Feed + select_feed_for_context: Select the feed for this context + select_feed_for_project: Select the feed for this project + footer: + send_feedback: Send feedback on %{version} + helpers: + select: + prompt: Выберите + submit: + create: Создать %{model} + submit: Сохранить %{model} + update: Обновить %{model} + integrations: + opensearch_description: Search in Tracks + layouts: + mobile_navigation: + calendar: Calendar + contexts: Contexts + feeds: Feeds + full: Full Site + home: Home + logout: Logout + new_action: New + projects: Projects + starred: Starred + tickler: Tickler + navigation: + admin: Admin + api_docs: REST API Docs + calendar: Calendar + calendar_title: Calendar of due actions + completed_tasks: Done + completed_tasks_title: Completed + contexts_title: Contexts + export: Export + export_title: Export data + feeds: Feeds + feeds_title: See a list of available feeds + group_view_by_context: Group by context + group_view_by_project: Group by project + group_view_by_title: Change the grouping of the actions on this page + help: "?" + help_page: Help + home: Home + home_title: Home + import: Import + import_title: Import data + integrations_: Integrate Tracks + manage_users: Manage users + manage_users_title: Add or delete users + mobile: Mobile Site + notes_title: View all notes + options: Options + organize: Organize + preferences: Preferences + preferences_title: Show my preferences + projects_title: Projects + recurring_todos: Recurring todos + recurring_todos_title: Manage recurring actions + review_title: Make review + search: Search All Items + show_empty_containers_context: Show empty contexts + show_empty_containers_project: Show empty projects + show_empty_containers_title: Show or hide the empty projects or contexts + starred: Starred + starred_title: See your starred actions + stats: Statistics + stats_title: See your statistics + tickler: Tickler + tickler_title: Tickler + view: View + next_actions_rss_feed: RSS feed of next actions + toggle_contexts: Toggle collapsed contexts + toggle_contexts_title: Make collapsed contexts (in)visible + toggle_notes: Toggle notes + toggle_notes_title: Toggle all notes + login: + account_login: Account login + cas_create_account: If you like to request on please go here to %{signup_link} + cas_logged_in_greeting: Hello, %{username}! You are authenticated. + cas_login: CAS Login + cas_no_user_found: Hello, %{username}! You do not have an account on Tracks. + cas_signup_link: Request account + cas_username_not_found: Sorry, no user by that CAS username exists (%{username}) + log_in_again: log in again. + logged_out: You have been logged out of Tracks. + 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" + 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 + session_time_out: Session has timed out. Please %{link} + session_will_expire: session will expire after %{hours} hour(s) of inactivity. + session_will_not_expire: session will not expire. + sign_in: Sign in + signup_prompt: Want to create an account? + successful: Logged in successfully. Welcome back! + successful_with_session_info: 'Login successful:' + unsuccessful: Login unsuccessful. + user_no_expiry: Stay logged in + models: + preference: + due_in: Due in %{days} days + due_on: Due on %{date} + due_styles: + - Due in ___ days + - Due on _______ + themes: + black: Black + light_blue: Light blue + project: + feed_description: Lists all the projects for %{username} + feed_title: Tracks Projects + todo: + error_date_must_be_future: must be a date in the future + user: + error_context_not_associated: Context id %{context} not associated with user id %{user}. + error_project_not_associated: Project id %{project} not associated with user id %{user}. + notes: + delete_confirmation: Are you sure that you want to delete the note '%{id}'? + delete_item_title: Delete item + delete_note_confirm: Are you sure that you want to delete the note '%{id}'? + delete_note_title: Delete the note '%{id}' + deleted_note: Deleted note '%{id}' + edit_item_title: Edit item + in_project: 'In: ' + no_notes_available: 'Currently there are no notes: add notes to projects from individual project pages.' + note_header: Note %{id} + note_link_title: Show note %{id} + note_location_link: 'In:' + save_status_message: Note %{id} was saved + show_note_title: Show note + number: + currency: + format: + delimiter: "," + format: "%u%n" + precision: 2 + separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros + unit: "$" + format: + delimiter: "," + precision: 3 + separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros + human: + decimal_units: + format: "%n %u" + units: + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион + unit: "." + format: + delimiter: '' + precision: 1 + significant: 'true' + strip_insignificant_zeros: 'true' + storage_units: + format: "%n %u" + units: + byte: + one: Byte + other: Bytes + gb: GB + kb: KB + mb: MB + tb: TB + percentage: + format: + delimiter: '' + format: "%n%" + precision: + format: + delimiter: '' + preferences: + authentication_header: Your authentication + change_authentication_type: Change your authentication type + change_identity_url: Change Your Identity URL + change_password: Change your password + current_authentication_type: Your authentication type is %{auth_type} + edit_preferences: Edit preferences + generate_new_token: Generate a new token + generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. + is_false: 'false' + is_true: 'true' + open_id_url: Your OpenID URL is + page_title: TRACKS::Preferences + page_title_edit: TRACKS::Edit Preferences + password_changed: You password has been changed, please log on again. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + show_number_completed: Show %{number} completed items + sms_context_none: None + staleness_starts_after: Staleness starts after %{days} days + tabs: + authentication: Authentication + date_and_time: Date and time + profile: Profile + remove_account: Remove account + tracks_behavior: Tracks behavior + title: Your preferences + token_description: Token (for feeds and API use) + token_header: Your token + updated: Preferences updated + projects: + actions_in_project_title: Actions in this project + active_projects: Active projects + add_note: Add a note + add_note_submit: Add note + add_project: Add Project + all_completed_tasks_title: TRACKS::List All Completed Actions in Project '%{project_name}' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty + completed_projects: Completed projects + completed_tasks_title: TRACKS::List Completed Actions in Project '%{project_name}' + default_context: The default context for this project is %{context} + default_context_removed: Removed default context + default_context_set: Set project's default context to %{default_context} + default_tags_removed_notice: Removed the default tags + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty + delete_project: Delete project + delete_project_confirmation: Are you sure that you want to delete the project '%{name}'? + delete_project_title: Delete the project + edit_project_settings: Edit Project Settings + edit_project_title: Edit project + hidden_projects: Hidden projects hide_form: Hide form - toggle_single: Add a next action + hide_form_title: Hide new project form + is_active: is active + last_completed_in_project: "(last %{number})" + list_completed_projects: TRACKS::List Completed Projects + list_projects: TRACKS::List Projects + list_reviews: TRACKS::Review + no_default_context: This project does not have a default context + no_last_completed_projects: No completed projects found + no_last_completed_recurring_todos: No completed recurring todos found + no_notes_attached: Currently there are no notes attached to this project + no_projects: Currently there are no projects + notes: Notes + notes_empty: There are no notes for this project + page_title: 'TRACKS::Project: %{project}' + project_destroyed_status: Deleted project '%{name}' + project_saved_status: Project saved + project_state: Project is %{state}. + set_default_tags_notice: Set project's default tags to %{default_tags} + settings: Settings + show_form: Add a project + show_form_title: Create a new project + state: This project is %{state} + status_project_name_changed: Name of project was changed + this_project: This project + to_new_project_page: Take me to the new project page + was_marked_complete: has been marked as completed + was_marked_hidden: has been marked as hidden + with_default_context: with a default context of '%{context_name}' + with_default_tags: and with '%{tags}' as the default tags + with_no_default_context: with no default context + with_no_default_tags: and with no default tags + search: + contexts_matching_query: Contexts matching query + no_results: Your search yielded no results. + notes_matching_query: Notes matching query + projects_matching_query: Projects matching query + tags_matching_query: Tags matching query + todos_matching_query: Todos matching query + shared: add_action: Add action add_actions: Add actions add_context: Add Context - tags_for_all_actions: Tags for all actions (sep. with commas) - toggle_single_title: Add a new next action - project_for_all_actions: Project for all actions context_for_all_actions: Context for all actions - toggle_multi: Add multiple next actions - separate_tags_with_commas: separate with commas - toggle_multi_title: Toggle single/multi new action form hide_action_form_title: Hide new action form + hide_form: Hide form make_actions_dependent: Make actions dependent on each other + multiple_next_actions: Multiple next actions (one on each line) + project_for_all_actions: Project for all actions + separate_tags_with_commas: separate with commas + tags_for_all_actions: Tags for all actions (sep. with commas) + toggle_multi: Add multiple next actions + toggle_multi_title: Toggle single/multi new action form + toggle_single: Add a next action + toggle_single_title: Add a new next action + sidebar: + list_empty: None + list_name_active_contexts: Active contexts + list_name_active_projects: Active projects + list_name_completed_projects: Completed projects + list_name_hidden_contexts: Hidden contexts + list_name_hidden_projects: Hidden projects states: + active: Active + active_plural: Active + blocked: Blocked + blocked_plural: Blocked + close: Closed + closed_plural: Closed + completed: Completed + completed_plural: Completed contexts: - hidden: Hidden contexts + ":": ":" active: Active contexts closed: Closed contexts + hidden: Hidden contexts + current: Up-to-date + current_plural: Up-to-date + hidden: Hidden + hidden_plural: Hidden projects: + ":": ":" active: Active projects blocked: Blocked closed: Closed projects @@ -355,276 +665,340 @@ en: hidden: Hidden projects review: Review stalled: Stalled - hidden_plural: Hidden - completed: Completed - completed_plural: Completed - visible_plural: Visible - visible: Visible - close: Closed - closed_plural: Closed - active_plural: Active - hidden: Hidden - active: Active - review_plural: Dated review: Dated - stalled_plural: Stalled + review_plural: Dated stalled: Stalled - blocked_plural: Blocked - blocked: Blocked - current_plural: Up-to-date - current: Up-to-date - layouts: - toggle_notes: Toggle notes - toggle_contexts: "Toggle collapsed contexts" - toggle_contexts_title: "Make collapsed contexts (in)visible" - next_actions_rss_feed: RSS feed of next actions - toggle_notes_title: Toggle all notes - mobile_navigation: - new_action: New - logout: Logout - feeds: Feeds - full: Full Site - starred: Starred - projects: Projects - tickler: Tickler - contexts: Contexts - home: Home - navigation: - manage_users_title: Add or delete users - recurring_todos: Recurring todos - api_docs: REST API Docs - feeds: Feeds - starred: Starred - notes_title: View all notes - review_title: Make review - stats: Statistics - tickler_title: Tickler - manage_users: Manage users - export_title: Export data - import_title: Import data - preferences: Preferences - integrations_: Integrate Tracks - help_page: Help - feeds_title: See a list of available feeds - calendar_title: Calendar of due actions - completed_tasks: Done - stats_title: See your statistics - tickler: Tickler - home_title: Home - starred_title: See your starred actions - recurring_todos_title: Manage recurring actions - view: View - organize: Organize - completed_tasks_title: Completed - home: Home - export: Export - import: Import - contexts_title: Contexts - calendar: Calendar - projects_title: Projects - search: Search All Items - preferences_title: Show my preferences - admin: Admin - help: "?" - mobile: Mobile Site - group_view_by_context: "Group by context" - group_view_by_project: "Group by project" - group_view_by_title: "Change the grouping of the actions on this page" - show_empty_containers_project: "Show empty projects" - show_empty_containers_context: "Show empty contexts" - show_empty_containers_title: "Show or hide the empty projects or contexts" - options: Options - footer: - send_feedback: Send feedback on %{version} - sidebar: - list_name_active_contexts: Active contexts - list_name_active_projects: Active projects - list_empty: None - list_name_completed_projects: Completed projects - list_name_hidden_projects: Hidden projects - list_name_hidden_contexts: Hidden contexts + stalled_plural: Stalled + visible: Visible + visible_plural: Visible + stats: + action_completion_time_title: Completion time (all completed actions) + action_selection_title: TRACKS::Action selection + actions: Actions + actions_30days_title: Actions in the last 30 days + actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions + actions_avg_completed: and completed an average of %{count} actions per month. + actions_avg_completed_30days: and completed an average of %{count} actions per day. + actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. + actions_avg_created: In the last 12 months you created on average %{count} actions + actions_day_of_week_legend: + day_of_week: Day of the week + number_of_actions: Number of actions + actions_day_of_week_title: Day of week (all actions) + actions_dow_30days_legend: + day_of_week: Day of the week + number_of_actions: Number of actions + actions_dow_30days_title: Day of week (past 30 days) + actions_further: " and further" + actions_last_year: Actions in the last years + actions_last_year_legend: + months_ago: Months ago + number_of_actions: Number of actions + 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 ' + 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} and further. + click_to_update_actions: Click on a bar in the chart to update the actions below. + contexts: Contexts + current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions + index_title: TRACKS::Statistics + labels: + avg_completed: Avg completed + avg_created: Avg created + completed: Completed + created: Created + month_avg_completed: "%{months} Month avg completed" + month_avg_created: "%{months} Month avg created" + legend: + actions: Actions + day_of_week: Day of week + months_ago: Months ago + number_of_actions: Number of actions + number_of_days: Number of days ago + percentage: Percentage + running_time: Running time of an action (weeks) + more_stats_will_appear: More statistics will appear here once you have added some actions. + no_actions_selected: There are no actions selected. + no_tags_available: no tags available + open_per_week: Active (visible and hidden) next actions per week + open_per_week_legend: + actions: Actions + weeks: Weeks ago + other_actions_label: "(others)" + projects: Projects + running_time_all: Current running time of all incomplete actions + running_time_all_legend: + actions: Actions + percentage: Percentage + running_time: Running time of an action (weeks). Click on a bar for more info + running_time_legend: + actions: Actions + percentage: Percentage + weeks: Running time of an action (weeks). Click on a bar for more info + spread_of_actions_for_all_context: Spread of actions for all contexts + spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts + tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. + tag_cloud_90days_title: Tag cloud actions in past 90 days + tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) + tag_cloud_title: Tag cloud for all actions + tags: Tags + time_of_day: Time of day (all actions) + time_of_day_legend: + number_of_actions: Number of actions + time_of_day: Time of day + tod30: Time of day (last 30 days) + tod30_legend: + number_of_actions: Number of actions + time_of_day: Time of day + top10_longrunning: Top 10 longest running projects + top10_projects: Top 10 projects + top10_projects_30days: Top 10 project in past 30 days + top5_contexts: Top 5 contexts + top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions + totals: Totals + totals_action_count: you have a total of %{count} actions + 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_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_incomplete_actions: You have %{count} incomplete actions + totals_project_count: You have %{count} projects. + totals_tag_count: You have %{count} tags placed on actions. + totals_unique_tags: Of those tags, %{count} are unique. + totals_visible_context_count: Of those %{count} are visible contexts + within_one: Within 1 + support: + array: + last_word_connector: ", and " + two_words_connector: " and " + words_connector: ", " + select: + prompt: Please select + 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: '' + pm: pm todos: - no_actions: - hidden: Currently there are no hidden actions found - tag_hidden: Currently there are no hidden actions found - without_project: Currently there are no actions without a project - deferred_pending: "Currently there are no deferred or pending actions" - recurring_todos: Currently there are no recurring todos - completed: Currently there are no completed actions - title: No actions found - not_done_with_tag: "Currently there are no incomplete actions with the tag '%{param}'" - not_done_project: Currently there are no incomplete actions in this project - not_done_context: Currently there are no incomplete actions in this context - completed_recurring: Currently there are no completed recurring todos - not_done: Currently there are no incomplete actions - project: Currently there are no incomplete actions in this project - context: Currently there are no incomplete actions in this context - completed_today: No actions were completed today - completed_rest_of_week: No actions were completed in the rest of this week - completed_rest_of_month: No actions were completed in the rest of this month - due_today: No actions due today - due_this_week: No actions due this week - due_next_week: No actions due in next week - due_this_month: No actions due in rest of this month - due_after_this_month: No actions due after this month + action_deferred: The action '%{description}' was deferred + action_deleted_error: Failed to delete the action + action_deleted_success: Successfully deleted next action + action_due_on: "(action due on %{date})" + action_marked_complete: The action '%{description}' was marked as %{completed} + action_marked_complete_error: The action '%{description}' was NOT marked as %{completed} due to an error on the server. + action_saved: Action saved + action_saved_to_tickler: Action saved to tickler actions: completed: Completed actions - home_completed: Completed actions - tag_completed: "Completed actions tagged with '%{param}'" - home_without_project: "Actions without project" - context_without_project: "Actions without project in %{param}" - project_project: "Actions in this project" - project_deferred_pending: Deferred/pending actions in this project - context_deferred_pending: Deferred/pending actions in this context - tag_deferred_pending: "Deferred/pending actions tagged with '%{param}'" - project_completed: Completed actions in this project context_completed: Completed actions in this context - tag_hidden: "Hidden actions tagged with '%{param}'" - error: - invalid_due_date: "Invalid due date" - invalid_show_from_date: "Invalid show from date" - completed_today: Completed today - completed_rest_of_week: Completed in the rest of this week - completed_rest_of_month: Completed in the rest of this month - show_from: Show from - error_starring_recurring: "Could not toggle the star of recurring todo '%{description}'" - recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added - completed_recurring: Completed recurring todos - added_new_next_action: Added new next action - completed_rest_of_previous_month: Completed in the rest of the previous month - blocked_by: Blocked by %{predecessors} - star_action: Star this action - completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed - defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. - unable_to_add_dependency: Unable to add dependency - done: Done? - star_action_with_description: "star the action '%{description}'" - tagged_with: "tagged with '%{tag_name}'" - completed: Completed - edit_action_with_description: "Edit the action '%{description}'" - action_due_on: (action due on %{date}) - remove_dependency: Remove dependency (does not delete the action) - archived_tasks_title: TRACKS::Archived completed tasks - list_incomplete_next_actions: Lists incomplete next actions - tags: Tags (separate with commas) - action_deleted_success: Successfully deleted next action - new_related_todo_created: A new todo was added which belongs to this recurring todo - context_changed: Context changed to %{name} + context_deferred_pending: Deferred/pending actions in this context + context_without_project: Actions without project in %{param} + home_completed: Completed actions + home_without_project: Actions without project + project_completed: Completed actions in this project + project_deferred_pending: Deferred/pending actions in this project + project_project: Actions in this project + tag_completed: Completed actions tagged with '%{param}' + tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_hidden: Hidden actions tagged with '%{param}' add_another_dependency: Add another dependency - mobile_todos_page_title: All actions - delete_recurring_action_title: Delete the recurring action - removed_predecessor: Removed %{successor} as dependency from %{predecessor}. - recurring_actions_title: TRACKS::Recurring Actions - next_action_needed: You need to submit at least one next action - action_saved: Action saved - scheduled_overdue: Scheduled to show %{days} days ago - action_deleted_error: Failed to delete the action - edit_action: Edit action + add_new_recurring: Add a new recurring action + added_dependency: Added %{dependency} as dependency. added_new_context: Added new context - next_actions_description: "Filter:" - list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions - set_to_pending: "%{task} set to pending" + added_new_next_action: Added new next action + added_new_next_action_plural: Added new next actions + added_new_next_action_singular: Added new next action added_new_project: Added new project + all_completed: All completed actions + all_completed_here: here + all_completed_tagged_page_title: TRACKS::All completed tasks with tag %{tag_name} + append_in_this_project: in this project + archived_tasks_title: TRACKS::Archived completed tasks + blocked_by: Blocked by %{predecessors} + calendar: + due_after_this_month: Due in %{next_month} and later + due_next_week: Due next week + due_this_month: Due in rest of %{month} + due_this_week: Due in rest of this week + due_today: Due today + get_in_ical_format: Get this calendar in iCal format + calendar_page_title: TRACKS::Calendar + cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! + clear_due_date: Clear due date + clear_show_from_date: Clear show from date + completed: Completed + completed_actions: Completed actions + completed_actions_with: Completed actions with the tag '%{tag_name}' + completed_in_archive: + one: There is a completed action in the archive. + other: There are %{count} completed actions in the archive. + completed_last_day: Completed in the last 24 hours + completed_last_x_days: Completed in the last %{count} days + completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed + completed_recurring: Completed recurring todos + completed_recurring_actions_title: TRACKS::Completed recurring actions + completed_rest_of_month: Completed in the rest of this month + completed_rest_of_previous_month: Completed in the rest of the previous month + completed_rest_of_week: Completed in the rest of this week + completed_tagged_page_title: TRACKS::Completed tasks with tag '%{tag_name}' + completed_tasks_title: TRACKS::Completed tasks + completed_today: Completed today + confirm_delete: Are you sure that you want to delete the action '%{description}'? + context_changed: Context changed to %{name} + convert_to_project: Make project + defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. + defer_x_days: + one: Defer 1 day + other: Defer %{count} days + deferred_actions_with: Deferred actions with the tag '%{tag_name}' + deferred_pending_actions: Deferred/pending actions + deferred_tasks_title: TRACKS::Tickler + delete: Delete + delete_action: Delete action + delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'? + delete_recurring_action_title: Delete the recurring action + deleted_success: The action was deleted successfully. + depends_on: Depends on + depends_on_separate_with_commas: Depends on (separate with commas) + done: Done? + drag_action_title: Drag onto another action to mark that action as a dependency for this action. + due: Due + edit: Edit + edit_action: Edit action + edit_action_with_description: Edit the action '%{description}' + edit_recurring_todo: Edit recurring action + error: + invalid_due_date: Invalid due date + invalid_show_from_date: Invalid show from date + error_completing_todo: There was an error completing / activating the recurring todo %{description} + error_deleting_item: There was an error deleting the item %{description} + error_deleting_recurring: There was an error deleting the recurring todo '%{description}' + error_removing_dependency: There was an error removing the dependency + error_saving_recurring: There was an error saving the recurring todo '%{description}' + error_starring: Could not toggle the star of this todo '%{description}' + error_starring_recurring: Could not toggle the star of recurring todo '%{description}' + error_toggle_complete: Could not mark this todo complete + feed_title_in_context: in context '%{context}' + feed_title_in_project: in project '%{project}' + feeds: + completed: 'Completed: %{date}' + due: 'Due: %{date}' + has_x_pending: + one: Has one pending action + other: Has %{count} pending actions + hidden_actions: Hidden actions + in_hidden_state: in hidden state + in_pending_state: in pending state + list_incomplete_next_actions: Lists incomplete next actions + list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions + mark_complete: Mark complete + mobile_todos_page_title: All actions + new_related_todo_created: A new todo was added which belongs to this recurring todo + new_related_todo_created_short: created a new todo + new_related_todo_not_created_short: did not create todo + next_action_description: Next action description + next_action_needed: You need to submit at least one next action + next_actions_description: 'Filter:' + next_actions_description_additions: + completed: in the last %{count} days + due_date: with a due date %{due_date} or earlier + next_actions_due_date: + due_in_x_days: Due in %{days} days + due_today: Due Today + due_tomorrow: Due Tomorrow + overdue_by: Overdue by %{days} day + overdue_by_plural: Overdue by %{days} days + next_actions_title: Tracks - Next Actions next_actions_title_additions: completed: actions completed due_today: due today due_within_a_week: due within a week - append_in_this_project: in this project - error_deleting_item: There was an error deleting the item %{description} - task_list_title: TRACKS::List tasks + no_actions: + completed: Currently there are no completed actions + completed_recurring: Currently there are no completed recurring todos + completed_rest_of_month: No actions were completed in the rest of this month + completed_rest_of_week: No actions were completed in the rest of this week + completed_today: No actions were completed today + context: Currently there are no incomplete actions in this context + deferred_pending: Currently there are no deferred or pending actions + due_after_this_month: No actions due after this month + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_this_week: No actions due this week + due_today: No actions due today + hidden: Currently there are no hidden actions found + not_done: Currently there are no incomplete actions + not_done_context: Currently there are no incomplete actions in this context + not_done_project: Currently there are no incomplete actions in this project + not_done_with_tag: Currently there are no incomplete actions with the tag '%{param}' + project: Currently there are no incomplete actions in this project + recurring_todos: Currently there are no recurring todos + tag_hidden: Currently there are no hidden actions found + title: No actions found + without_project: Currently there are no actions without a project no_actions_due_this_week: No actions due in rest of this week - error_completing_todo: There was an error completing / activating the recurring todo %{description} - recurring_pattern_removed: The recurrence pattern is removed from %{count} - convert_to_project: Make project - delete_recurring_action_confirm: "Are you sure that you want to delete the recurring action '%{description}'?" - completed_last_day: Completed in the last 24 hours - show_in_days: Show in %{days} days - no_project: --No project-- - error_saving_recurring: "There was an error saving the recurring todo '%{description}'" - new_related_todo_created_short: created a new todo - all_completed: All completed actions - feed_title_in_context: "in context '%{context}'" - completed_tagged_page_title: "TRACKS::Completed tasks with tag '%{tag_name}'" - edit: Edit - pending: Pending - completed_actions_with: "Completed actions with the tag '%{tag_name}'" - deleted_success: The action was deleted successfully. - completed_tasks_title: TRACKS::Completed tasks - feed_title_in_project: "in project '%{project}'" - clear_due_date: Clear due date - hidden_actions: Hidden actions - error_removing_dependency: There was an error removing the dependency - was_due_on_date: was due on %{date} - show_on_date: Show on %{date} - recurrence_period: Recurrence period - deferred_actions_with: "Deferred actions with the tag '%{tag_name}'" - recurring_deleted_success: The recurring action was deleted successfully. - confirm_delete: "Are you sure that you want to delete the action '%{description}'?" - deferred_tasks_title: TRACKS::Tickler - next_actions_title: Tracks - Next Actions - next_action_description: Next action description - clear_show_from_date: Clear show from date - calendar_page_title: TRACKS::Calendar - unresolved_dependency: The value you entered in the dependency field did not resolve to an existing action. This value will not be saved with the rest of the action. Continue? - in_hidden_state: in hidden state - show_today: Show Today - next_actions_due_date: - overdue_by: Overdue by %{days} day - due_today: Due Today - due_in_x_days: Due in %{days} days - overdue_by_plural: Overdue by %{days} days - due_tomorrow: Due Tomorrow - completed_last_x_days: Completed in the last %{count} days - defer_x_days: - one: Defer 1 day - other: Defer %{count} days - added_new_next_action_singular: Added new next action - feeds: - completed: "Completed: %{date}" - due: "Due: %{date}" - deferred_pending_actions: Deferred/pending actions - has_x_pending: - one: Has one pending action - other: Has %{count} pending actions - delete_action: Delete action - error_deleting_recurring: "There was an error deleting the recurring todo '%{description}'" - recurring_todos: Recurring todos - delete: Delete - cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! - drag_action_title: Drag onto another action to mark that action as a dependency for this action. + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with no_last_completed_actions: No completed actions found - depends_on: Depends on - 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." - action_marked_complete: "The action '%{description}' was marked as %{completed}" - added_new_next_action_plural: Added new next actions - new_related_todo_not_created_short: did not create todo - error_starring: "Could not toggle the star of this todo '%{description}'" - calendar: - get_in_ical_format: Get this calendar in iCal format - due_today: Due today - due_this_week: Due in rest of this week - due_next_week: Due next week - due_this_month: Due in rest of %{month} - due_after_this_month: Due in %{next_month} and later - show_tomorrow: Show Tomorrow - tagged_page_title: "TRACKS::Tagged with '%{tag_name}'" - action_deferred: "The action '%{description}' was deferred" - mark_complete: Mark complete + no_project: "--No project--" + no_recurring_todos: No recurring todos + notes: Notes + overdue: Overdue + pending: Pending recurrence: - ends_on_number_times: Ends after %{number} times - ends_on_date: Ends on %{date} - every_work_day: Every work day - weekly_options: Settings for weekly recurring actions - weekly: Weekly - monthly_options: Settings for monthly recurring actions - starts_on: Starts on + daily: Daily + daily_every_number_day: Every %{number} day(s) daily_options: Settings for daily recurring actions + day_x_on_every_x_month: Day %{day} on every %{month} month + ends_on: Ends on + ends_on_date: Ends on %{date} + ends_on_number_times: Ends after %{number} times + every_work_day: Every work day monthly: Monthly + monthly_every_xth_day: The %{day} %{day_of_week} of every %{month} month + monthly_options: Settings for monthly recurring actions + no_end_date: No end date pattern: + day_names: + - sunday + - monday + - tuesday + - wednesday + - thursday + - friday + - saturday + due: due + every_day: every day + every_month: every month + every_n: every %{n} + every_n_days: every %{n} days + every_n_months: every %{n} months + every_xth_day_of_every_n_months: every %{x} %{day} of every %{n_months} + every_year_on: every year on %{date} + first: first + fourth: fourth + from: from + last: last month_names: - - + - - January - February - Match @@ -637,411 +1011,121 @@ en: - October - November - December - third: third - every_n: every %{n} - every_n_days: every %{n} days - every_n_months: every %{n} months - every_day: every day on_day_n: on day %{n} - second: second - every_xth_day_of_every_n_months: every %{x} %{day} of every %{n_months} - from: from - weekly: weekly - last: last - the_xth_day_of_month: the %{x} %{day} of %{month} - times: for %{number} times on_work_days: on work days - first: first - every_year_on: every year on %{date} - day_names: - - sunday - - monday - - tuesday - - wednesday - - thursday - - friday - - saturday + second: second show: show - fourth: fourth - due: due + the_xth_day_of_month: the %{x} %{day} of %{month} + third: third + times: for %{number} times until: until - every_month: every month - daily: Daily - yearly_every_x_day: Every %{month} %{day} + weekly: weekly recurrence_on: - options: Use the calculated date to due_date: set the actions due date - show_options: Show the action - show_always: always - show_days_before: "not until %{days} days before the due date" from_tickler: set the date the action should be shown (do not set a due date) - daily_every_number_day: Every %{number} day(s) + options: Use the calculated date to + show_always: always + show_days_before: not until %{days} days before the due date + show_options: Show the action + starts_on: Starts on + weekly: Weekly weekly_every_number_week: Returns every %{number} week on - ends_on: Ends on - no_end_date: No end date - day_x_on_every_x_month: Day %{day} on every %{month} month - yearly_options: Settings for yearly recurring actions - yearly_every_xth_day: The %{day} %{day_of_week} of %{month} - monthly_every_xth_day: The %{day} %{day_of_week} of every %{month} month + weekly_options: Settings for weekly recurring actions yearly: Yearly - added_dependency: Added %{dependency} as dependency. - all_completed_tagged_page_title: TRACKS::All completed tasks with tag %{tag_name} + yearly_every_x_day: Every %{month} %{day} + yearly_every_xth_day: The %{day} %{day_of_week} of %{month} + yearly_options: Settings for yearly recurring actions recurrence_completed: There is no next action after the recurring action you just finished. The recurrence is completed - error_toggle_complete: Could not mark this todo complete - in_pending_state: in pending state - due: Due - action_marked_complete_error: "The action '%{description}' was NOT marked as %{completed} due to an error on the server." - depends_on_separate_with_commas: Depends on (separate with commas) - action_saved_to_tickler: Action saved to tickler + recurrence_period: Recurrence period + recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added recurring_action_saved: Recurring action saved - completed_in_archive: - one: There is a completed action in the archive. - other: There are %{count} completed actions in the archive. - to_tickler: to tickler - next_actions_description_additions: - completed: in the last %{count} days - due_date: with a due date %{due_date} or earlier - overdue: Overdue - add_new_recurring: Add a new recurring action - edit_recurring_todo: Edit recurring action + recurring_actions_title: TRACKS::Recurring Actions + recurring_deleted_success: The recurring action was deleted successfully. + recurring_pattern_removed: The recurrence pattern is removed from %{count} + recurring_todos: Recurring todos + remove_dependency: Remove dependency (does not delete the action) + removed_predecessor: Removed %{successor} as dependency from %{predecessor}. + scheduled_overdue: Scheduled to show %{days} days ago see_all_completed: You can see all completed actions %{link} - all_completed_here: here - completed_recurring_actions_title: 'TRACKS::Completed recurring actions' - contexts: - delete_context_title: Delete context - all_completed_tasks_title: "TRACKS::All Completed actions in the context '%{context_name}'" - hide_form: Hide form - show_form_title: Add a context - delete_context_confirmation: "Are you sure that you want to delete the context '%{name}'? Be aware that this will also delete all (recurring) actions in this context!" - delete_context: Delete context - edit_context: Edit context - hide_form_title: Hide new context form - context_hide: Hide from front page? - context_state: Context state - hidden_contexts: Hidden contexts - no_contexts_active: Currently there are no active contexts - no_contexts_closed: Currently there are no closed contexts - show_form: Create a new context - visible_contexts: Visible contexts - save_status_message: Context saved - add_context: Add Context - context_name: Context name - update_status_message: Name of context was changed - completed_tasks_title: "TRACKS::Completed actions in the context '%{context_name}'" - new_context_post: "' will be also created. Are you sure?" - status_active: Context is active - last_completed_in_context: "(last %{number})" - context_deleted: "Deleted context '%{name}'" - no_contexts_hidden: Currently there are no hidden contexts - new_context_pre: New context ' - status_hidden: Context is hidden - todos_append: in this context - projects: - was_marked_hidden: has been marked as hidden - edit_project_title: Edit project - default_tags_removed_notice: Removed the default tags - default_context_set: Set project's default context to %{default_context} - all_completed_tasks_title: "TRACKS::List All Completed Actions in Project '%{project_name}'" - hide_form: Hide form - page_title: "TRACKS::Project: %{project}" - show_form_title: Create a new project - list_completed_projects: TRACKS::List Completed Projects - to_new_project_page: Take me to the new project page - no_notes_attached: Currently there are no notes attached to this project - this_project: This project - project_state: Project is %{state}. - last_completed_in_project: (last %{number}) - no_last_completed_projects: No completed projects found - notes: Notes - no_last_completed_recurring_todos: No completed recurring todos found - notes_empty: There are no notes for this project - no_projects: Currently there are no projects - hide_form_title: Hide new project form - with_no_default_context: with no default context - delete_project: Delete project - show_form: Add a project - actions_in_project_title: Actions in this project - delete_project_confirmation: "Are you sure that you want to delete the project '%{name}'?" - with_default_context: "with a default context of '%{context_name}'" - set_default_tags_notice: Set project's default tags to %{default_tags} - is_active: is active - settings: Settings - completed_projects: Completed projects - with_default_tags: "and with '%{tags}' as the default tags" - list_projects: TRACKS::List Projects - list_reviews: TRACKS::Review - project_saved_status: Project saved - project_destroyed_status: "Deleted project '%{name}'" - add_project: Add Project - add_note: Add a note - completed_tasks_title: "TRACKS::List Completed Actions in Project '%{project_name}'" - delete_project_title: Delete the project - hidden_projects: Hidden projects - add_note_submit: Add note - was_marked_complete: has been marked as completed - default_context_removed: Removed default context - default_context: The default context for this project is %{context} - status_project_name_changed: Name of project was changed - active_projects: Active projects - no_default_context: This project does not have a default context - with_no_default_tags: and with no default tags - edit_project_settings: Edit Project Settings - state: This project is %{state} - notes: - delete_confirmation: "Are you sure that you want to delete the note '%{id}'?" - delete_item_title: Delete item - delete_note_title: "Delete the note '%{id}'" - note_link_title: Show note %{id} - show_note_title: Show note - deleted_note: "Deleted note '%{id}'" - edit_item_title: Edit item - note_location_link: "In:" - no_notes_available: "Currently there are no notes: add notes to projects from individual project pages." - note_header: Note %{id} - delete_note_confirm: "Are you sure that you want to delete the note '%{id}'?" - in_project: "In: " - save_status_message: "Note %{id} was saved" - integrations: - opensearch_description: Search in Tracks - preferences: - open_id_url: Your OpenID URL is - staleness_starts_after: Staleness starts after %{days} days - change_identity_url: Change Your Identity URL - change_password: Change your password - password_changed: You password has been changed, please log on again. - updated: Preferences updated - page_title: TRACKS::Preferences - title: Your preferences - token_description: Token (for feeds and API use) - is_false: "false" - show_number_completed: Show %{number} completed items - page_title_edit: TRACKS::Edit Preferences - is_true: "true" - edit_preferences: Edit preferences - sms_context_none: None - generate_new_token: Generate a new token - token_header: Your token - authentication_header: Your authentication - current_authentication_type: Your authentication type is %{auth_type} - change_authentication_type: Change your authentication type - remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. - tabs: - authentication: Authentication - tracks_behavior: Tracks behavior - profile: Profile - date_and_time: Date and time - remove_account: Remove account - generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. - data: - import_successful: Import was successful. - import_errors: Some errors occurred during import - import_destination_invalid: Invalid import destination - stats: - index_title: TRACKS::Statistics - within_one: Within 1 - tag_cloud_title: Tag cloud for all actions - tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) - tag_cloud_90days_title: Tag cloud actions in past 90 days - actions: Actions - totals_active_project_count: Of those %{count} are active projects - actions_last_year_legend: - number_of_actions: Number of actions - months_ago: Months ago - totals_first_action: Since your first action on %{date} - actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. - top10_longrunning: Top 10 longest running projects - actions_dow_30days_title: Day of week (past 30 days) - legend: - actions: Actions - number_of_days: Number of days ago - number_of_actions: Number of actions - day_of_week: Day of week - percentage: Percentage - running_time: Running time of an action (weeks) - months_ago: Months ago - current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions - open_per_week: Active (visible and hidden) next actions per week - open_per_week_legend: - actions: Actions - weeks: Weeks ago - totals_deferred_actions: "of which %{count} are deferred actions in the tickler" - running_time_legend: - actions: Actions - percentage: Percentage - weeks: Running time of an action (weeks). Click on a bar for more info - totals_action_count: you have a total of %{count} actions - totals_incomplete_actions: You have %{count} incomplete actions - totals_unique_tags: Of those tags, %{count} are unique. - actions_avg_completed_30days: and completed an average of %{count} actions per day. - top5_contexts: Top 5 contexts - actions_lastyear_title: Actions in the last 12 months - totals_actions_completed: "%{count} of these are completed." - totals_context_count: You have %{count} contexts. - totals_visible_context_count: Of those %{count} are visible contexts - totals_blocked_actions: "%{count} are dependent on the completion of their actions." - projects: Projects - action_completion_time_title: Completion time (all completed actions) - actions_last_year: Actions in the last years - actions_min_max_completion_days: The Min-/maximum days to complete is %{min}/%{max}. - tags: Tags - actions_min_completion_time: The minimum time to complete is %{time}. - no_tags_available: no tags available - actions_day_of_week_title: Day of week (all actions) - totals_project_count: You have %{count} projects. - running_time_all: Current running time of all incomplete actions - actions_30days_title: Actions in the last 30 days - time_of_day: Time of day (all actions) - totals_hidden_project_count: "%{count} are hidden" - tod30: Time of day (last 30 days) - tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. - more_stats_will_appear: More statistics will appear here once you have added some actions. - top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions - actions_further: " and further" - totals_tag_count: You have %{count} tags placed on actions. - top10_projects_30days: Top 10 project in past 30 days - spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts - actions_selected_from_week: "Actions selected from week " - spread_of_actions_for_all_context: Spread of actions for all contexts - click_to_show_actions_from_week: Click %{link} to show the actions from week %{week} and further. - other_actions_label: (others) - top10_projects: Top 10 projects - totals_completed_project_count: and %{count} are completed projects. - actions_avg_created: In the last 12 months you created on average %{count} actions - click_to_return: Click %{link} to return to the statistics page. - actions_avg_completed: and completed an average of %{count} actions per month. - totals: Totals - time_of_day_legend: - number_of_actions: Number of actions - time_of_day: Time of day - contexts: Contexts - click_to_return_link: here - totals_hidden_context_count: and %{count} are hidden contexts. - labels: - month_avg_completed: "%{months} Month avg completed" - completed: Completed - month_avg_created: "%{months} Month avg created" - avg_created: Avg created - avg_completed: Avg completed - created: Created - running_time_all_legend: - actions: Actions - percentage: Percentage - running_time: Running time of an action (weeks). Click on a bar for more info - click_to_update_actions: Click on a bar in the chart to update the actions below. - no_actions_selected: There are no actions selected. - actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions - actions_dow_30days_legend: - number_of_actions: Number of actions - day_of_week: Day of the week - actions_day_of_week_legend: - number_of_actions: Number of actions - day_of_week: Day of the week - tod30_legend: - number_of_actions: Number of actions - time_of_day: Time of day - action_selection_title: TRACKS::Action selection + set_to_pending: "%{task} set to pending" + show_from: Show from + show_in_days: Show in %{days} days + show_on_date: Show on %{date} + show_today: Show Today + show_tomorrow: Show Tomorrow + star_action: Star this action + star_action_with_description: star the action '%{description}' + tagged_page_title: TRACKS::Tagged with '%{tag_name}' + tagged_with: tagged with '%{tag_name}' + tags: Tags (separate with commas) + 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." + 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 to an existing action. This value will not be saved with the rest of the action. Continue? + was_due_on_date: was due on %{date} users: - successfully_deleted_user: Successfully deleted user %{username} - failed_to_delete_user: Failed to delete user %{username} - total_contexts: Total contexts - first_user_heading: "Welcome to TRACKS. To get started, please create an admin account:" - openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. - auth_type_update_error: "There was a problem updating your authentication type: %{error_messages}" - destroy_successful: User %{login} was successfully destroyed - new_token_generated: New token successfully generated - total_projects: Total projects - signup_successful: Signup successful for user %{username}. - change_password_submit: Change password - no_signups_title: TRACKS::No signups - user_created: User created. - manage_users: Manage users account_signup: Account signup - password_updated: Password updated. - desired_login: Desired login - signup: Signup - confirm_password: Confirm password - new_user_heading: "Sign up a new user:" - auth_type_updated: Authentication type updated. - total_actions: Total actions - change_password_title: TRACKS::Change password - change_auth_type_title: TRACKS::Change authentication type - change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. - password_confirmation_label: Confirm password - destroy_error: There was an error deleting the user %{login} - email_address: Email address - choose_password: Choose password - register_with_cas: With your CAS username - label_auth_type: Authentication type - new_password_label: New password - you_have_to_reset_your_password: "You have to reset your password" - first_user_title: TRACKS::Sign up as the admin user - new_user_title: TRACKS::Sign up - destroy_user: Destroy user - total_users_count: You have a total of %{count} users - destroy_confirmation: "Warning: this will delete user '%{login}', all their actions, contexts, project and notes. Are you sure that you want to continue?" - signup_new_user: Sign up new user - openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. - identity_url: Identity URL - auth_change_submit: Change authentication type - change_authentication_type: Change authentication type - total_notes: Total notes - select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. approve_tos: I approve the Terms of Service + auth_change_submit: Change authentication type + auth_type_update_error: 'There was a problem updating your authentication type: %{error_messages}' + auth_type_updated: Authentication type updated. + change_auth_type_title: TRACKS::Change authentication type + change_authentication_type: Change authentication type + change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. + change_password_submit: Change password + change_password_title: TRACKS::Change password + choose_password: Choose password + confirm_password: Confirm password + desired_login: Desired login + destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their actions, contexts, project and notes. Are you sure that you want to continue?' + destroy_error: There was an error deleting the user %{login} + destroy_successful: User %{login} was successfully destroyed + destroy_user: Destroy user + email_address: Email address + failed_to_delete_user: Failed to delete user %{username} + first_user_heading: 'Welcome to TRACKS. To get started, please create an admin account:' + first_user_title: TRACKS::Sign up as the admin user + identity_url: Identity URL + label_auth_type: Authentication type + manage_users: Manage users + new_password_label: New password + new_token_generated: New token successfully generated + new_user_heading: 'Sign up a new user:' + new_user_title: TRACKS::Sign up + no_signups_title: TRACKS::No signups + openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. + openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. + password_confirmation_label: Confirm password + password_updated: Password updated. + register_with_cas: With your CAS username + select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. + signup: Signup + signup_new_user: Sign up new user + signup_successful: Signup successful for user %{username}. + successfully_deleted_user: Successfully deleted user %{username} tos_link: read the Terms of Service - feedlist: - choose_context: Choose the context you want a feed of - actions_due_today: Actions due today or earlier - rss_feed: RSS Feed - ical_feed: iCal feed - all_contexts: All Contexts - legend: "Legend:" - all_projects: All Projects - choose_project: Choose the project you want a feed of - select_feed_for_project: Select the feed for this project - active_projects_wo_next: Active projects with no next actions - project_needed: There needs to be at least one project before you can request a feed - active_starred_actions: All starred, active actions - select_feed_for_context: Select the feed for this context - projects_and_actions: Active projects with their actions - context_needed: There needs to be at least one context before you can request a feed - actions_due_next_week: Actions due in 7 days or earlier - notice_incomplete_only: "Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page" - all_actions: All actions - actions_completed_last_week: Actions completed in the last 7 days - context_centric_actions: Feeds for incomplete actions in a specific context - plain_text_feed: Plain Text Feed - last_fixed_number: Last %{number} actions - project_centric: Feeds for incomplete actions in a specific project - login: - login_cas: go to the CAS - sign_in: Sign in - signup_prompt: Want to create an account? - openid_identity_url_not_found: "Sorry, no user by that identity URL exists (%{identity_url})" - user_no_expiry: Stay logged in - cas_no_user_found: "Hello, %{username}! You do not have an account on Tracks." - cas_login: CAS Login - successful_with_session_info: "Login successful:" - please_login: Please log in to use Tracks - cas_logged_in_greeting: "Hello, %{username}! You are authenticated." - cas_username_not_found: "Sorry, no user by that CAS username exists (%{username})" - mobile_use_openid: "…or login with an OpenID" - cas_create_account: If you like to request on please go here to %{signup_link} - account_login: Account login - cas_signup_link: Request account - session_will_not_expire: session will not expire. - successful: Logged in successfully. Welcome back! - option_separator: or, - session_time_out: Session has timed out. Please %{link} - session_will_expire: "session will expire after %{hours} hour(s) of inactivity." - login_standard: go back to the standard login - logged_out: You have been logged out of Tracks. - login_with_openid: login with an OpenID - unsuccessful: Login unsuccessful. - log_in_again: log in again. - search: - contexts_matching_query: Contexts matching query - tags_matching_query: Tags matching query - notes_matching_query: Notes matching query - no_results: Your search yielded no results. - todos_matching_query: Todos matching query - projects_matching_query: Projects matching query + total_actions: Total actions + total_contexts: Total contexts + total_notes: Total notes + total_projects: Total projects + total_users_count: You have a total of %{count} users + user_created: User created. + you_have_to_reset_your_password: You have to reset your password + will_paginate: + next_label: След → + page_entries_info: + multi_page: Отображено %{model} %{from} - %{to} из %{count} + multi_page_html: Отображено %{model} %{from} - %{to} из %{count} + single_page: + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} + zero: "%{model} не найдено" + single_page_html: + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} + zero: "%{model} не найдено" + page_gap: "…" + previous_label: "← Пред" diff --git a/config/locales/es.yml b/config/locales/es.yml index e62cb72d..4c409c38 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -41,8 +41,14 @@ es: show_from: Mostrar tags: Etiquetas user: + auth_type: Auth type + display_name: Display name + email: Email address first_name: Primer nombre last_name: Apellido + login: Login + open_id_url: OpenID URL + password: Password errors: full_messages: format: "%{attribute} %{message}" @@ -62,6 +68,10 @@ es: less_than_or_equal_to: debe ser menor o igual a %{count} not_a_number: no es un número odd: tiene que ser impar + record_invalid: 'Validation failed: %{errors}' + restrict_dependent_destroy: + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее taken: Ya se ha dado too_long: es demasiado largo (el máximo es %{count} caracteres) too_short: es demasiado corto (mínimo %{count} caracteres) @@ -90,6 +100,7 @@ es: back: Atrás bugs: Errores cancel: Cancelar + collapse_expand: Collapse/expand context: Contexto contexts: Contextos contribute: Contribuir @@ -109,6 +120,7 @@ es: go_back: Volver atrás last: Último logout: Salir + mailing_list: Mailing List month: mes months: meses next: Próximo @@ -133,13 +145,11 @@ 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 @@ -150,17 +160,14 @@ es: wiki: Wiki contexts: add_context: Añadir contexto - all_completed_tasks_title: 'TRACKS:: Todas las acciones completadas en ''%{context_name}'' - contexto' - completed_tasks_title: 'TRACKS:: Las acciones completadas en ''%{context_name}'' - el contexto' + all_completed_tasks_title: 'TRACKS:: Todas las acciones completadas en ''%{context_name}'' contexto' + 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_name: Nombre del contexto + context_state: Context state delete_context: Eliminar 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!" + 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!" delete_context_title: Eliminar contexto edit_context: Editar contexto hidden_contexts: Contextos ocultos @@ -169,7 +176,9 @@ es: last_completed_in_context: en este contexto (últimos %{number}) new_context_post: "' También se ha creado. ¿Está seguro?" new_context_pre: Nuevo contexto ' + no_contexts_: 'No contexts ' no_contexts_active: Actualmente no hay contextos activos + no_contexts_closed: Currently there are no closed contexts no_contexts_hidden: Actualmente no hay contextos ocultos save_status_message: Contexto guardado show_form: Crear un nuevo contexto @@ -180,8 +189,10 @@ es: update_status_message: Nombre de contexto ha cambiado visible_contexts: Contextos visible data: + import_destination_invalid: Invalid import destination import_errors: Han ocurrido algunos errores durante la importación import_successful: Importación se realizó correctamente. + invalid_import_destination: Invalid import destination date: abbr_day_names: - Dom @@ -217,6 +228,8 @@ es: default: "%Y-%m-%d" long: "%B %d, %Y" longer: "%A, %d %b %Y" + month_day: Month day + only_day: Only day short: "%b %d" month_names: - @@ -232,6 +245,7 @@ es: - Octubre - Noviembre - Diciembre + order: "[:year, :month, :day]" datetime: distance_in_words: about_x_hours: @@ -278,8 +292,31 @@ es: second: Segundos year: Año errors: - user_unauthorized: '401 No autorizado: Solo los usuarios administrativos pueden - acceder a esta función.' + format: "%{attribute} %{message}" + messages: + accepted: должен быть подтвержден + blank: должна быть заполнена + confirmation: не соответствует %{attribute} + empty: не может быть пустым + equal_to: должно равняться %{count} + even: должно быть четным + exclusion: зарезервированно + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше или равно %{count} + inclusion: не входит в список + invalid: неверное + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + not_an_integer: должно быть целым числом + odd: должно быть нечетным + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято + too_long: 'слишком длинное (максимум: %{count} символов)' + too_short: 'слишком кроткое (минимум: %{count} символов)' + wrong_length: неверной длины (должно быть %{count} символов) + user_unauthorized: '401 No autorizado: Solo los usuarios administrativos pueden acceder a esta función.' feedlist: actions_completed_last_week: Tareas completadas en los últimos 7 días actions_due_next_week: Tareas pendientes en 7 días o menos @@ -292,29 +329,35 @@ es: choose_context: Elija el contexto en el que desea un canal de choose_project: Elegir el proyecto que quiere un canal de context_centric_actions: Feeds de acciones incompletas en un contexto específico - context_needed: Es necesario que haya al menos un contexto antes de poder solicitar - un feed + 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/s %{number} accion/es 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.' + 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.' plain_text_feed: Canal Texto sin formato project_centric: Feeds de acciones incompletas en un proyecto específico - project_needed: Es necesario que haya al menos un proyecto antes de poder solicitar - un feed + project_needed: Es necesario que haya al menos un proyecto antes de poder solicitar un feed projects_and_actions: Proyectos activos con sus acciones rss_feed: RSS Feed select_feed_for_context: Seleccione la alimentación de este contexto select_feed_for_project: Seleccione la fuente para este proyecto footer: send_feedback: Envía comentarios sobre el %{version} + helpers: + select: + prompt: Выберите + submit: + create: Создать %{model} + submit: Сохранить %{model} + update: Обновить %{model} integrations: opensearch_description: Buscar en las Tracks layouts: mobile_navigation: + calendar: Calendar contexts: Contextos feeds: Feeds + full: Full Site home: Inicio logout: Cerrar sesión new_action: Nueva tarea @@ -333,13 +376,21 @@ es: export_title: Importar y exportar datos feeds: Feeds feeds_title: See a list of available feeds + group_view_by_context: Group by context + group_view_by_project: Group by project + group_view_by_title: Change the grouping of the actions on this page help: "?" + help_page: Help home: Inicio home_title: Inicio + import: Import + import_title: Import data integrations_: Integrar Tracks manage_users: Administrar usuarios manage_users_title: Añadir o eliminar usuarios + mobile: Mobile Site notes_title: Mostrar todas las notas + options: Options organize: Organizar preferences: Preferencias preferences_title: Mostrar mis preferencias @@ -348,6 +399,9 @@ es: recurring_todos_title: Manage recurring actions review_title: Posibilidad de una revisión search: Search All Items + show_empty_containers_context: Show empty contexts + show_empty_containers_project: Show empty projects + show_empty_containers_title: Show or hide the empty projects or contexts starred: Estrellas starred_title: See your starred actions stats: Estadísticas @@ -381,6 +435,7 @@ es: session_will_expire: session will expire after %{hours} hour(s) of inactivity. session_will_not_expire: session will not expire. sign_in: Entrar + signup_prompt: Want to create an account? successful: Has entrado con éxito. Bienvenido! successful_with_session_info: 'Login successful:' unsuccessful: Login unsuccessful. @@ -392,16 +447,17 @@ es: due_styles: - Due in ___ days - Due on _______ + themes: + black: Black + light_blue: Light blue project: feed_description: Lists all the projects for %{username} feed_title: Tracks Projects todo: error_date_must_be_future: must be a date in the future user: - error_context_not_associated: Context id %{context} not associated with user - id %{user}. - error_project_not_associated: Project id %{project} not associated with user - id %{user}. + error_context_not_associated: Context id %{context} not associated with user id %{user}. + error_project_not_associated: Project id %{project} not associated with user id %{user}. notes: delete_confirmation: Are you sure that you want to delete the note '%{id}'? delete_item_title: Delete item @@ -410,23 +466,43 @@ es: deleted_note: Deleted note '%{id}' edit_item_title: Edit item in_project: 'En:' - no_notes_available: 'Currently there are no notes: add notes to projects from - individual project pages.' + no_notes_available: 'Currently there are no notes: add notes to projects from individual project pages.' note_header: Note %{id} note_link_title: Show note %{id} note_location_link: 'In:' + save_status_message: Note %{id} was saved show_note_title: Show note number: currency: format: delimiter: "," format: "%u%n" + precision: '2' separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros unit: "€" format: delimiter: "," + precision: '3' separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros human: + decimal_units: + format: "%n %u" + units: + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион + unit: "." + format: + delimiter: Delimiter + precision: '1' + significant: 'true' + strip_insignificant_zeros: 'true' storage_units: format: "%n %u" units: @@ -437,6 +513,13 @@ es: kb: KB mb: MB tb: Tuberculosis + percentage: + format: + delimiter: Delimiter + format: "%n%" + precision: + format: + delimiter: Delimiter preferences: authentication_header: Your authentication change_authentication_type: Change your authentication type @@ -445,14 +528,14 @@ es: current_authentication_type: Your authentication type is %{auth_type} edit_preferences: Edit preferences generate_new_token: Generate a new token - generate_new_token_confirm: Are you sure? Generating a new token will replace - the existing one and break any external usages of this token. + generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. is_false: 'false' is_true: 'true' open_id_url: Your OpenID URL is page_title: TRACKS::Preferences page_title_edit: TRACKS::Edit Preferences password_changed: Que ha cambiado la contraseña, por favor vuelve a iniciar sesión. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. show_number_completed: Show %{number} completed items sms_context_none: None staleness_starts_after: Staleness starts after %{days} days @@ -460,6 +543,7 @@ es: authentication: Autenticación date_and_time: Fecha y hora profile: Perfil + remove_account: Remove account tracks_behavior: Rastrea el comportamiento de title: Your preferences token_description: Token (for feeds and API use) @@ -471,18 +555,19 @@ es: add_note: Añadir una nota add_note_submit: Añadir nota add_project: Añadir Proyecto - all_completed_tasks_title: 'TRACKS:: Lista de todas las acciones terminado en - ''%{project_name}'' Proyecto' + all_completed_tasks_title: 'TRACKS:: Lista de todas las acciones terminado en ''%{project_name}'' Proyecto' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty completed_projects: Proyectos completados - completed_tasks_title: 'TRACKS:: Lista de Acciones completadas en ''%{project_name}'' - Proyecto' + completed_tasks_title: 'TRACKS:: Lista de Acciones completadas en ''%{project_name}'' Proyecto' default_context: El contexto por defecto para este proyecto es %{context} default_context_removed: Eliminado el contexto por defecto default_context_set: Set project's default context to %{default_context} default_tags_removed_notice: Removed the default tags + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty delete_project: Delete project - delete_project_confirmation: Are you sure that you want to delete the project - '%{name}'? + delete_project_confirmation: Are you sure that you want to delete the project '%{name}'? delete_project_title: Delete the project edit_project_settings: Edit Project Settings edit_project_title: Editar proyecto @@ -490,18 +575,19 @@ es: hide_form: Esconder formulario hide_form_title: Hide new project form is_active: está activo + last_completed_in_project: "(last %{number})" list_completed_projects: 'TRACKS:: Lista de Proyectos Realizados' list_projects: TRACKS::Lista de Proyectos list_reviews: TRACKS::Revisión no_default_context: Este proyecto no tiene un contexto por defecto no_last_completed_projects: No hay proyectos terminados encontrado - no_last_completed_recurring_todos: No se ha completado las acciones repetitivas - que se encuentran + no_last_completed_recurring_todos: No se ha completado las acciones repetitivas que se encuentran no_notes_attached: Actualmente no hay notas adjuntas a este proyectos no_projects: Currently there are no projects notes: Notes notes_empty: No hay notas para este proyecto page_title: 'TRACKS::Project: %{project}' + project_destroyed_status: Deleted project '%{name}' project_saved_status: Project saved project_state: Project is %{state}. set_default_tags_notice: Set project's default tags to %{default_tags} @@ -553,12 +639,29 @@ es: active_plural: Active blocked: Bloqueado blocked_plural: Bloqueado + close: Closed + closed_plural: Closed completed: Completed completed_plural: Completed + contexts: + ":": ":" + active: Active contexts + closed: Closed contexts + hidden: Hidden contexts current: Hasta al día current_plural: Hasta al día hidden: Hidden hidden_plural: Hidden + projects: + ":": ":" + active: Active projects + blocked: Blocked + closed: Closed projects + completed: Completed + current: Current + hidden: Hidden projects + review: Review + stalled: Stalled review: Fechado review_plural: Fechado stalled: Estancado @@ -570,13 +673,10 @@ es: action_selection_title: TRACKS::Selección de Acción actions: Acciones actions_30days_title: Acciones en los últimos 30 días - actions_actions_avg_created_30days: In the last 30 days you created on average - %{count} actions + actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions actions_avg_completed: and completed an average of %{count} actions per month. - actions_avg_completed_30days: and completed an average of %{count} actions per - day. - actions_avg_completion_time: Of all your completed actions, the average time to - complete is %{count} days. + actions_avg_completed_30days: and completed an average of %{count} actions per day. + actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. actions_avg_created: In the last 12 months you created on average %{count} actions actions_day_of_week_legend: day_of_week: Día de la semana @@ -597,12 +697,10 @@ es: 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} - and further. + click_to_show_actions_from_week: Click %{link} to show the actions from week %{week} and further. click_to_update_actions: Click on a bar in the chart to update the actions below. contexts: Contexts - current_running_time_of_incomplete_visible_actions: Current running time of incomplete - visible actions + current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions index_title: TRACKS::Estadística labels: avg_completed: Avg completed @@ -619,8 +717,7 @@ es: number_of_days: Number of days ago percentage: Percentage running_time: Running time of an action (weeks) - more_stats_will_appear: More statistics will appear here once you have added some - actions. + more_stats_will_appear: More statistics will appear here once you have added some actions. no_actions_selected: No hay tareas seleccionadas. no_tags_available: no tags available open_per_week: Próximas acciones activas (visibles y ocultas) a la semana @@ -639,13 +736,10 @@ es: percentage: Percentage weeks: Running time of an action (weeks). Click on a bar for more info spread_of_actions_for_all_context: Spread of actions for all context - spread_of_running_actions_for_visible_contexts: Spread of running actions for - visible contexts - tag_cloud_90days_description: This tag cloud includes tags of actions that were - created or completed in the past 90 days. + spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts + tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. tag_cloud_90days_title: Tag cloud actions in past 90 days - tag_cloud_description: This tag cloud includes tags of all actions (completed, - not completed, visible and/or hidden) + tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) tag_cloud_title: Tag cloud for all actions tags: Tags time_of_day: Time of day (all actions) @@ -660,8 +754,7 @@ es: top10_projects: Top 10 projects top10_projects_30days: Top 10 project in past 30 days top5_contexts: Top 5 contexts - top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete - actions + top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions totals: Totals totals_action_count: you have a total of %{count} actions totals_actions_completed: "%{count} of these are completed." @@ -694,18 +787,30 @@ es: month_day: "%B %d" short: "%d %b %H:%M" stats: "%a %d-%m" + time: Time pm: pm todos: 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_marked_complete: The action '%{description}' was marked - as %{completed} - action_marked_complete_error: The action '%{description}' was - NOT marked as %{completed} due to an error on the server. + action_marked_complete: The action '%{description}' was marked as %{completed} + action_marked_complete_error: The action '%{description}' was NOT marked as %{completed} due to an error on the server. action_saved: Action saved action_saved_to_tickler: Acción guardada en el recordatorio. + actions: + completed: Completed actions + context_completed: Completed actions in this context + context_deferred_pending: Deferred/pending actions in this context + context_without_project: Actions without project in %{param} + home_completed: Completed actions + home_without_project: Actions without project + project_completed: Completed actions in this project + project_deferred_pending: Deferred/pending actions in this project + project_project: Actions in this project + tag_completed: Completed actions tagged with '%{param}' + tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_hidden: Hidden actions tagged with '%{param}' add_another_dependency: Add another dependency add_new_recurring: Add a new recurring action added_dependency: Added %{dependency} as dependency. @@ -716,32 +821,32 @@ es: added_new_project: Added new project all_completed: Todas las acciones realizadas all_completed_here: aquí - all_completed_tagged_page_title: 'TRACKS:: Todas las tareas realizadas con etiqueta - %{tag_name}' + all_completed_tagged_page_title: 'TRACKS:: Todas las tareas realizadas con etiqueta %{tag_name}' append_in_this_project: en este proyecto archived_tasks_title: TRACKS::Archived completed tasks blocked_by: Blocked by %{predecessors} calendar: + due_after_this_month: Due in %{next_month} and later due_next_week: Due next week due_this_month: Due in rest of %{month} due_this_week: Due in rest of this week due_today: Due today get_in_ical_format: Get this calendar in iCal format calendar_page_title: TRACKS::Calendar - cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency - to a completed action! + cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! clear_due_date: Clear due date clear_show_from_date: Clear show from date completed: Completed + completed_actions: Completed actions completed_actions_with: Acciones completadas with the tag %{tag_name} completed_in_archive: one: There is one completed action in the archive. other: There are %{count} completed actions in the archive. completed_last_day: Completed in the last 24 hours completed_last_x_days: Completed in last %{count} days - completed_recurrence_completed: There is no next action after the recurring action - you just deleted. The recurrence is completed + completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed completed_recurring: Completed recurring todos + completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Completado en el resto de este mes completed_rest_of_previous_month: Completado en el resto del mes anterior completed_rest_of_week: Completado en el resto de esta semana @@ -751,8 +856,7 @@ es: confirm_delete: Are you sure that you want to delete the action '%{description}'? context_changed: Context changed to %{name} convert_to_project: Make project - defer_date_after_due_date: Defer date is after due date. Please edit and adjust - due date before deferring. + defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. defer_x_days: one: Defer one day other: Defer %{count} days @@ -761,8 +865,7 @@ es: deferred_tasks_title: TRACKS::Recordatorio delete: Delete delete_action: Delete action - delete_recurring_action_confirm: Are you sure that you want to delete the recurring - action '%{description}'? + delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'? delete_recurring_action_title: Delete the recurring action deleted_success: The action was deleted successfully. depends_on: Depends on @@ -774,8 +877,10 @@ es: edit_action: Edit action edit_action_with_description: Edit the action '%{description}' edit_recurring_todo: Editar la acción de repetición - error_completing_todo: There was an error completing / activating the recurring - todo %{description} + error: + invalid_due_date: Invalid due date + invalid_show_from_date: Invalid show from date + error_completing_todo: There was an error completing / activating the recurring todo %{description} error_deleting_item: There was an error deleting the item %{description} error_deleting_recurring: There was an error deleting the recurring todo '%{description}' error_removing_dependency: There was an error removing the dependency @@ -795,11 +900,10 @@ es: in_hidden_state: en estado oculto in_pending_state: en estado pendiente list_incomplete_next_actions: Lista las siguientes tareas incompletas - list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next - actions + list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions + mark_complete: Mark complete mobile_todos_page_title: Todas las tareas - new_related_todo_created: Una nueva tarea fue añadida y que pertenece a esta tarea - recurrente + new_related_todo_created: Una nueva tarea fue añadida y que pertenece a esta tarea recurrente new_related_todo_created_short: creada una nueva tarea new_related_todo_not_created_short: no se creó la tarea next_action_description: Descripción de la nueva tarea @@ -821,9 +925,39 @@ es: due_within_a_week: due within a week no_actions: completed: Actualmente no hay acciones completadas. + completed_recurring: Currently there are no completed recurring todos + completed_rest_of_month: No actions were completed in the rest of this month + completed_rest_of_week: No actions were completed in the rest of this week + completed_today: No actions were completed today + context: Currently there are no incomplete actions in this context + deferred_pending: Currently there are no deferred or pending actions + due_after_this_month: No actions due after this month + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_this_week: No actions due this week + due_today: No actions due today + hidden: Currently there are no hidden actions found + not_done: Currently there are no incomplete actions + not_done_context: Currently there are no incomplete actions in this context + not_done_project: Currently there are no incomplete actions in this project + not_done_with_tag: Currently there are no incomplete actions with the tag '%{param}' + project: Currently there are no incomplete actions in this project + recurring_todos: Currently there are no recurring todos + tag_hidden: Currently there are no hidden actions found + title: No actions found + without_project: Currently there are no actions without a project no_actions_due_this_week: No actions due in rest of this week + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with no_last_completed_actions: No encontró las acciones realizadas no_project: "--No project--" + no_recurring_todos: No recurring todos + notes: Notes overdue: Overdue pending: Pending recurrence: @@ -852,6 +986,8 @@ es: every_day: every day every_month: every month every_n: every %{n} + every_n_days: every %{n} days + every_n_months: every %{n} months every_xth_day_of_every_n_months: every %{x} %{day} of every %{n_months} every_year_on: every year on %{date} first: first @@ -881,6 +1017,13 @@ es: times: for %{number} times until: until weekly: weekly + recurrence_on: + due_date: set the actions due date + from_tickler: set the date the action should be shown (do not set a due date) + options: Use the calculated date to + show_always: always + show_days_before: not until %{days} days before the due date + show_options: Show the action starts_on: Starts on weekly: Weekly weekly_every_number_week: Returns every %{number} week on @@ -889,11 +1032,9 @@ es: yearly_every_x_day: Every %{month} %{day} yearly_every_xth_day: The %{day} %{day_of_week} of %{month} yearly_options: Settings for yearly recurring actions - recurrence_completed: There is no next action after the recurring action you just - finished. The recurrence is completed + recurrence_completed: There is no next action after the recurring action you just finished. The recurrence is completed recurrence_period: Recurrence period - recurring_action_deleted: Action was deleted. Because this action is recurring, - a new action was added + recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added recurring_action_saved: Recurring action saved recurring_actions_title: TRACKS::Recurring Actions recurring_deleted_success: The recurring action was deleted successfully. @@ -920,33 +1061,30 @@ es: other: "%{count} tickler items are now due - refresh the page to see them." to_tickler: al recordatorio unable_to_add_dependency: Unable to add dependency - unresolved_dependency: The value you entered in the dependency field did not resolve - to an existing action. This value will not be saved with the rest of the action. - Continue? + unresolved_dependency: The value you entered in the dependency field did not resolve to an existing action. This value will not be saved with the rest of the action. Continue? was_due_on_date: was due on %{date} users: account_signup: Account signup + approve_tos: I approve the Terms of Service auth_change_submit: Change authentication type - auth_type_update_error: 'There was a problem updating your authentication type: - %{error_messages}' + auth_type_update_error: 'There was a problem updating your authentication type: %{error_messages}' auth_type_updated: Authentication type updated. change_auth_type_title: TRACKS::Change authentication type change_authentication_type: Change authentication type - change_password_prompt: Enter your new password in the fields below and click - 'Change password' to replace your current password with your new one. + change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. change_password_submit: Change password change_password_title: TRACKS::Change password choose_password: Choose password confirm_password: Confirm password desired_login: Desired login - destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their - actions, contexts, project and notes. Are you sure that you want to continue?' + destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their actions, contexts, project and notes. Are you sure that you want to continue?' destroy_error: There was an error deleting the user %{login} destroy_successful: User %{login} was successfully destroyed destroy_user: Destroy user + email_address: Email address failed_to_delete_user: Failed to delete user %{username} - first_user_heading: 'Welcome to TRACKS. To get started, please create an admin - account:' + first_user_heading: 'Welcome to TRACKS. To get started, please create an admin account:' + first_user_title: TRACKS::Sign up as the admin user identity_url: Identity URL label_auth_type: Authentication type manage_users: Manage users @@ -955,19 +1093,17 @@ es: new_user_heading: 'Sign up a new user:' new_user_title: TRACKS::Sign up as the admin user no_signups_title: TRACKS::No signups - openid_ok_pref_failed: You have successfully verified %{url} as your identity - but there was a problem saving your authentication preferences. - openid_url_verified: You have successfully verified %{url} as your identity and - set your authentication type to OpenID. + openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. + openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. password_confirmation_label: Confirm password password_updated: Password updated. register_with_cas: With your CAS username - select_authentication_type: Select your new authentication type and click 'Change - authentication type' to replace your current settings. + select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. signup: Signup signup_new_user: Sign up new user signup_successful: Signup successful for user %{username}. successfully_deleted_user: Successfully deleted user %{username} + tos_link: read the Terms of Service total_actions: Total actions total_contexts: Total contexts total_notes: Total notes @@ -978,8 +1114,8 @@ es: will_paginate: next_label: Siguiente » page_entries_info: - multi_page_html: Viendo %{model} %{from} - %{to} de %{count} - en el total de + multi_page: Отображено %{model} %{from} - %{to} из %{count} + multi_page_html: Viendo %{model} %{from} - %{to} de %{count} en el total de single_page: one: Viendo del 1 %{model} other: Viendo todos los %{count} %{model} diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 5eb1b9d8..855f2cf9 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1,206 +1,199 @@ --- fi: - number: - format: - separator: "," - precision: 3 - delimiter: " " - human: - format: - precision: 1 - delimiter: "" - storage_units: - format: "%n %u" - units: - kb: kt - tb: Tt - gb: Gt - byte: - one: Tavu - other: Tavua - mb: Mt - percentage: - format: - delimiter: "" - currency: - format: - format: "%u%n" - unit: € - separator: "," - precision: 2 - delimiter: " " - precision: - format: - delimiter: "" activerecord: attributes: + note: + created_at: Luotu + updated_at: Päivitetty + preference: + date_format: Päivämäärämuoto + due_style: Due style + first_name: Etunimi + last_name: Sukunimi + locale: Kieli + mobile_todos_per_page: Toimenpidettä sivulla (mobiilisivustolla) + refresh: Refresh interval (in minutes) + review_period: Project review interval + show_completed_projects_in_sidebar: Show completed projects in sidebar + show_hidden_contexts_in_sidebar: Näytä piilotetut asiayhteydet sivupalkissa + show_hidden_projects_in_sidebar: Näytä piilotetut projektit sivupalkissa + show_number_completed: Show number of completed actions + show_project_on_todo_done: Go to project page on completing todo + sms_context: Sähköpostin oletusasiayhteys + sms_email: From email + staleness_starts: Vanhentumisen alkaminen + time_zone: Aikavyöhyke + title_date_format: Title date format + verbose_action_descriptors: Verbose action descriptors + week_starts: Week starts on project: - name: Nimi - default_tags: Oletustagit default_context_name: Oletuskonteksti + default_tags: Oletustagit description: Kuvaus + name: Nimi todo: - predecessors: Riippuu - show_from: Näytä alkaen - notes: Muistiinpanot - project: Projekti context: Konteksti description: Kuvaus due: Määräpäivä + notes: Muistiinpanot + predecessors: Riippuu + project: Projekti + show_from: Näytä alkaen tags: Tagit user: auth_type: Kirjautumistyyppi display_name: Näyttönimi + email: Email address first_name: Etunimi last_name: Sukunimi login: Login open_id_url: OpenID-URL password: Salasana - preference: - show_hidden_projects_in_sidebar: Näytä piilotetut projektit sivupalkissa - date_format: Päivämäärämuoto - show_hidden_contexts_in_sidebar: Näytä piilotetut asiayhteydet sivupalkissa - mobile_todos_per_page: Toimenpidettä sivulla (mobiilisivustolla) - verbose_action_descriptors: Verbose action descriptors - staleness_starts: Vanhentumisen alkaminen - review_period: Project review interval - sms_context: Sähköpostin oletusasiayhteys - title_date_format: Title date format - show_number_completed: Show number of completed actions - refresh: Refresh interval (in minutes) - week_starts: Week starts on - last_name: Sukunimi - locale: Kieli - due_style: Due style - time_zone: Aikavyöhyke - show_project_on_todo_done: Go to project page on completing todo - sms_email: From email - first_name: Etunimi - show_completed_projects_in_sidebar: Show completed projects in sidebar - note: - created_at: Luotu - updated_at: Päivitetty errors: + full_messages: + format: "%{attribute} %{message}" messages: - greater_than_or_equal_to: must be greater than or equal to %{count} - record_invalid: "Validation failed: %{errors}" - confirmation: doesn't match confirmation - less_than_or_equal_to: must be less than or equal to %{count} - blank: can't be blank - invalid: "cannot contain the comma (',') character" - exclusion: is reserved - odd: must be odd - even: must be even - too_short: is too short (minimum is %{count} characters) - empty: can't be empty - wrong_length: is the wrong length (should be %{count} characters) - less_than: must be less than %{count} - greater_than: must be greater than %{count} - equal_to: must be equal to %{count} accepted: must be accepted - too_long: is too long (maximum is %{count} characters) - taken: has already been taken + blank: can't be blank + confirmation: doesn't match confirmation + empty: can't be empty + equal_to: must be equal to %{count} + even: must be even + exclusion: is reserved + greater_than: must be greater than %{count} + greater_than_or_equal_to: must be greater than or equal to %{count} inclusion: is not included in the list + invalid: cannot contain the comma (',') character + less_than: must be less than %{count} + less_than_or_equal_to: must be less than or equal to %{count} not_a_number: is not a number + odd: must be odd + record_invalid: 'Validation failed: %{errors}' + restrict_dependent_destroy: + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее + taken: has already been taken + too_long: is too long (maximum is %{count} characters) + too_short: is too short (minimum is %{count} characters) + wrong_length: is the wrong length (should be %{count} characters) models: project: attributes: name: blank: project must have a name - too_long: project name must be less than 256 characters taken: already exists - full_messages: - format: "%{attribute} %{message}" + too_long: project name must be less than 256 characters template: - body: "There were problems with the following fields:" + body: 'There were problems with the following fields:' header: one: 1 error prohibited this %{model} from being saved other: "%{count} errors prohibited this %{model} from being saved" - models: - project: - feed_title: Tracks Projects - feed_description: Lists all the projects for %{username} - todo: - error_date_must_be_future: must be a date in the future - user: - error_context_not_associated: Context id %{context} not associated with user id %{user}. - error_project_not_associated: Project id %{project} not associated with user id %{user}. - preference: - due_on: Due on %{date} - due_in: Due in %{days} days - due_styles: - - Due in ___ days - - Due on _______ - datetime: - prompts: - minute: Minute - second: Seconds - month: Month - hour: Hour - day: Day - year: Year - distance_in_words: - less_than_x_minutes: - one: less than a minute - other: less than %{count} minutes - zero: less than 1 minute - x_days: - one: 1 day - other: "%{count} days" - almost_x_years: - one: almost 1 year - other: almost %{count} years - x_seconds: - one: 1 second - other: "%{count} seconds" - about_x_hours: - one: about 1 hour - other: about %{count} hours - less_than_x_seconds: - one: less than 1 second - other: less than %{count} seconds - zero: less than 1 second - x_months: - one: 1 month - other: "%{count} months" - x_minutes: - one: 1 minute - other: "%{count} minutes" - about_x_years: - one: about 1 year - other: about %{count} years - about_x_months: - one: about 1 month - other: about %{count} months - over_x_years: - one: over 1 year - other: over %{count} years - half_a_minute: half a minute - time: - am: am - formats: - default: "%a, %d %b %Y %H:%M:%S %z" - time: "" - short: "%d %b %H:%M" - month_day: "%B %d" - long: "%B %d, %Y %H:%M" - stats: "%a %d-%m" - pm: pm + common: + action: Toimenpide + actions: Toimenpiteet + actions_midsentence: + one: toimenpide + other: toimenpidettä + zero: toimenpidettä + add: Lisää + ajaxError: Virhe noudettaessa palvelimelta + back: Takaisin + bugs: Ohjelmavirheet + cancel: Peruuta + collapse_expand: Sulje/avaa + context: Asiayhtyes + contexts: Asiayhteydet + contribute: Osallistu + create: Luo + days_midsentence: + one: päivä + other: päivää + zero: päivää + deferred: lykätty + description: Kuvaus + drag_handle: VEDÄ + email: Sähköposti + errors_with_fields: 'Seuraavien kenttien kanssa esiintyi ongelmia:' + first: Ensimmäinen + forth: Neljäs + fourth: Neljäs + go_back: Takaisin + last: Viimeinen + logout: Kirjaudu ulos + mailing_list: Postituslista + month: kuukausi + months: kuukautta + next: Seuraava + none: Ei + not_available_abbr: ei + note: + one: 1 muistiinpano + other: "%{count} muistiinpanoa" + zero: ei muistiinpanoja + notes: Muistiinpanot + numbered_step: Askel %{number} + ok: Ok + optional: valinnainen + previous: Edellinen + project: Projekti + projects: Projektit + recurring_todos: Toistuvat toimenpiteet + review: Käsittely + search: Haku + second: sekunti + server_error: Palvelimella tapahtui virhe. + show_all: Näytä kaikki + sort: + alphabetically: Aakkosjärjestyksessä + alphabetically_confirm: Haluatko varmasti lajitella nämä projektit aakkosjärjestykseen? Tämä korvaa nykyisen lajittelujärjestyksen. + alphabetically_title: Lajittele projektit aakkosjärjestykseen + by_task_count: Tehtävämäärän mukaan + by_task_count_title: Lajittele tehtävämäärän mukaan + by_task_count_title_confirm: Haluatko varmasti lajitella nämä projektit tehtävämäärän mukaan? Tämä korvaa nykyisen lajittelujärjestyksen. + sort: Lajittele + third: Kolmas + todo: tehtävä + update: Päivitä + website: Web-sivusto + week: viikko + weeks: viikkoa + wiki: Wiki + contexts: + add_context: Lisää asiayhteys + all_completed_tasks_title: TRACKS::All Completed actions in the context '%{context_name}' + completed_tasks_title: TRACKS::Completed actions in the context '%{context_name}' + context_deleted: Deleted context '%{name}' + context_hide: Piilota etusivulta? + context_name: Asiayhteyden nimi + context_state: Asiayhteyden tila + delete_context: Poista asiayhteys + delete_context_confirmation: Are you sure that you want to delete the context '%{name}'? Be aware that this will also delete all (recurring) actions in this context! + delete_context_title: Poista asiayhteys + edit_context: Muokkaa asiayhteyttä + hidden_contexts: Piilotetut asiayhteydet + hide_form: Piilota lomake + hide_form_title: Piilota asiayhteyden lisäyslomake + last_completed_in_context: "(last %{number})" + new_context_post: "' will be also created. Are you sure?" + new_context_pre: New context ' + no_contexts_: 'No contexts ' + no_contexts_active: Currently there are no active contexts + no_contexts_closed: Currently there are no closed contexts + no_contexts_hidden: Currently there are no hidden contexts + save_status_message: Asiayhteys tallennettu + show_form: Luo uusi asiayhteys + show_form_title: Lisää asiayhteys + status_active: Context is active + status_hidden: Context is hidden + todos_append: in this context + update_status_message: Name of context was changed + visible_contexts: Näkyvät asiayhteydet + data: + import_destination_invalid: Invalid import destination + import_errors: Some errors occurred during import + import_successful: Tuonti onnistui + invalid_import_destination: Invalid import destination date: - month_names: - - - - Tammikuu - - Helmikuu - - Maaliskuu - - Huhtikuu - - Toukokuu - - Kesäkuu - - Heinäkuu - - Elokuu - - Syyskuu - - Lokakuu - - Marraskuu - - Joulukuu abbr_day_names: - Su - Ma @@ -209,27 +202,8 @@ fi: - To - Pe - La - order: - - :year - - :month - - :day - formats: - only_day: "" - default: "%d.%m.%Y" - short: "%b %d" - month_day: "" - long: "%B %d, %Y" - longer: "%A %B %d, %Y" - day_names: - - Sunnuntai - - Maanantai - - Tiistai - - Keskiviikko - - Torstai - - Perjantai - - Lauantai abbr_month_names: - - + - - Tammi - Helmi - Maalis @@ -242,107 +216,447 @@ fi: - Loka - Marras - Joulu - support: - array: - words_connector: ", " - last_word_connector: " ja " - two_words_connector: " ja " - select: - prompt: Valitse + day_names: + - Sunnuntai + - Maanantai + - Tiistai + - Keskiviikko + - Torstai + - Perjantai + - Lauantai + formats: + default: "%d.%m.%Y" + long: "%B %d, %Y" + longer: "%A %B %d, %Y" + month_day: '' + only_day: '' + short: "%b %d" + month_names: + - + - Tammikuu + - Helmikuu + - Maaliskuu + - Huhtikuu + - Toukokuu + - Kesäkuu + - Heinäkuu + - Elokuu + - Syyskuu + - Lokakuu + - Marraskuu + - Joulukuu + order: + - :year + - :month + - :day + datetime: + distance_in_words: + about_x_hours: + one: about 1 hour + other: about %{count} hours + about_x_months: + one: about 1 month + other: about %{count} months + about_x_years: + one: about 1 year + other: about %{count} years + almost_x_years: + one: almost 1 year + other: almost %{count} years + half_a_minute: half a minute + less_than_x_minutes: + one: less than a minute + other: less than %{count} minutes + zero: less than 1 minute + less_than_x_seconds: + one: less than 1 second + other: less than %{count} seconds + zero: less than 1 second + over_x_years: + one: over 1 year + other: over %{count} years + x_days: + one: 1 day + other: "%{count} days" + x_minutes: + one: 1 minute + other: "%{count} minutes" + x_months: + one: 1 month + other: "%{count} months" + x_seconds: + one: 1 second + other: "%{count} seconds" + prompts: + day: Day + hour: Hour + minute: Minute + month: Month + second: Seconds + year: Year errors: - user_unauthorized: "401 Pääsy kielletty: Vain ylläpitäjillä on pääsy tähän toiminnallisuuteen." - common: - back: Takaisin - third: Kolmas - recurring_todos: Toistuvat toimenpiteet - actions: Toimenpiteet - actions_midsentence: - zero: toimenpidettä - one: toimenpide - other: toimenpidettä - add: Lisää - previous: Edellinen - show_all: Näytä kaikki - logout: Kirjaudu ulos - go_back: Takaisin - optional: valinnainen - week: viikko - cancel: Peruuta - none: Ei - second: sekunti - month: kuukausi - server_error: Palvelimella tapahtui virhe. - notes: Muistiinpanot - review: Käsittely - last: Viimeinen - projects: Projektit - action: Toimenpide - project: Projekti - ok: Ok - contribute: Osallistu - website: Web-sivusto - first: Ensimmäinen - numbered_step: Askel %{number} - sort: - by_task_count_title: Lajittele tehtävämäärän mukaan - by_task_count_title_confirm: Haluatko varmasti lajitella nämä projektit tehtävämäärän mukaan? Tämä korvaa nykyisen lajittelujärjestyksen. - alphabetically: Aakkosjärjestyksessä - alphabetically_confirm: Haluatko varmasti lajitella nämä projektit aakkosjärjestykseen? Tämä korvaa nykyisen lajittelujärjestyksen. - alphabetically_title: Lajittele projektit aakkosjärjestykseen - sort: Lajittele - by_task_count: Tehtävämäärän mukaan - fourth: Neljäs - create: Luo - months: kuukautta - contexts: Asiayhteydet - errors_with_fields: "Seuraavien kenttien kanssa esiintyi ongelmia:" - next: Seuraava - todo: tehtävä - note: - zero: "ei muistiinpanoja" - one: "1 muistiinpano" - other: "%{count} muistiinpanoa" - context: Asiayhtyes - drag_handle: VEDÄ - description: Kuvaus - bugs: Ohjelmavirheet - update: Päivitä - forth: Neljäs - weeks: viikkoa - wiki: Wiki - email: Sähköposti - mailing_list: Postituslista - search: Haku - ajaxError: Virhe noudettaessa palvelimelta - days_midsentence: - zero: päivää - one: päivä - other: päivää - deferred: lykätty - not_available_abbr: "ei" - collapse_expand: Sulje/avaa - shared: - multiple_next_actions: Useita seuraavia toimenpiteitä (omilla riveillään) + format: "%{attribute} %{message}" + messages: + accepted: должен быть подтвержден + blank: должна быть заполнена + confirmation: не соответствует %{attribute} + empty: не может быть пустым + equal_to: должно равняться %{count} + even: должно быть четным + exclusion: зарезервированно + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше или равно %{count} + inclusion: не входит в список + invalid: неверное + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + not_an_integer: должно быть целым числом + odd: должно быть нечетным + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято + too_long: 'слишком длинное (максимум: %{count} символов)' + too_short: 'слишком кроткое (минимум: %{count} символов)' + wrong_length: неверной длины (должно быть %{count} символов) + user_unauthorized: '401 Pääsy kielletty: Vain ylläpitäjillä on pääsy tähän toiminnallisuuteen.' + feedlist: + actions_completed_last_week: Actions completed in the last 7 days + actions_due_next_week: Actions due in 7 days or earlier + actions_due_today: Actions due today or earlier + active_projects_wo_next: Active projects with no next actions + active_starred_actions: All starred, active actions + all_actions: All actions + all_contexts: All Contexts + all_projects: All Projects + choose_context: Choose the context you want a feed of + choose_project: Choose the project you want a feed of + context_centric_actions: Feeds for incomplete actions in a specific context + context_needed: There needs to be at least one context before you can request a feed + ical_feed: iCal feed + last_fixed_number: Last %{number} actions + legend: 'Legend:' + notice_incomplete_only: 'Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page' + plain_text_feed: Plain Text Feed + project_centric: Feeds for incomplete actions in a specific project + project_needed: There needs to be at least one project before you can request a feed + projects_and_actions: Active projects with their actions + rss_feed: RSS Feed + select_feed_for_context: Select the feed for this context + select_feed_for_project: Select the feed for this project + footer: + send_feedback: Lähetä palautetta versiosta %{version} + helpers: + select: + prompt: Выберите + submit: + create: Создать %{model} + submit: Сохранить %{model} + update: Обновить %{model} + integrations: + opensearch_description: Search in Tracks + layouts: + mobile_navigation: + calendar: Calendar + contexts: Asiayhteydet + feeds: Syötteet + full: Täysi sivusto + home: Etusivu + logout: Kirjaudu ulos + new_action: Uusi + projects: Projektit + starred: Tähditetyt + tickler: Tulevat + navigation: + admin: Ylläpito + api_docs: REST-rajapintadokumentaatio + calendar: Kalenteri + calendar_title: Kalenteri määräpäivistä + completed_tasks: Valmis + completed_tasks_title: Valmiit + contexts_title: Asiayhteydet + export: Vie + export_title: Vie tietoja + feeds: Syötteet + feeds_title: Näytä lista syötteistä + group_view_by_context: Ryhmittele asiayhteyden mukaan + group_view_by_project: Ryhmittele projektin mukaan + group_view_by_title: Muuta sivun toimenpiteiden ryhmittelyä + help: "?" + help_page: Ohje + home: Etusivu + home_title: Etusivu + import: Tuo + import_title: Tuo tietoja + integrations_: Integroi Tracks + manage_users: Hallitse käyttäjiä + manage_users_title: Lisää tai poista käyttäjiä + mobile: Mobiilisivusto + notes_title: Näytä kaikki muistiinpanot + options: Asetukset + organize: Järjestele + preferences: Asetukset + preferences_title: Näytä asetukseni + projects_title: Projektit + recurring_todos: Toistuvat toimenpiteet + recurring_todos_title: Hallitse toistuvia toimenpiteitä + review_title: Make review + search: Hae kaikesta + show_empty_containers_context: Näytä tyhjät asiayhteydet + show_empty_containers_project: Näytä tyhjät projektit + show_empty_containers_title: Näytä tai piilota tyhjät asiayhteydet tai projektit + starred: Tähdellä merkityt + starred_title: Näytä tähdellä merkityt toimenpiteesi + stats: Tilastot + stats_title: Näytä tilastosi + tickler: Tulevat + tickler_title: Tulevat + view: Näytä + next_actions_rss_feed: RSS feed of next actions + toggle_contexts: Toggle collapsed contexts + toggle_contexts_title: Make collapsed contexts (in)visible + toggle_notes: Toggle notes + toggle_notes_title: Toggle all notes + login: + account_login: Account login + cas_create_account: If you like to request on please go here to %{signup_link} + cas_logged_in_greeting: Hello, %{username}! You are authenticated. + cas_login: CAS Login + cas_no_user_found: Hello, %{username}! You do not have an account on Tracks. + cas_signup_link: Request account + cas_username_not_found: Sorry, no user by that CAS username exists (%{username}) + log_in_again: log in again. + logged_out: You have been logged out of Tracks. + 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" + 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 + session_time_out: Session has timed out. Please %{link} + session_will_expire: session will expire after %{hours} hour(s) of inactivity. + session_will_not_expire: session will not expire. + sign_in: Sign in + signup_prompt: Want to create an account? + successful: Logged in successfully. Welcome back! + successful_with_session_info: 'Login successful:' + unsuccessful: Login unsuccessful. + user_no_expiry: Stay logged in + models: + preference: + due_in: Due in %{days} days + due_on: Due on %{date} + due_styles: + - Due in ___ days + - Due on _______ + themes: + black: Black + light_blue: Light blue + project: + feed_description: Lists all the projects for %{username} + feed_title: Tracks Projects + todo: + error_date_must_be_future: must be a date in the future + user: + error_context_not_associated: Context id %{context} not associated with user id %{user}. + error_project_not_associated: Project id %{project} not associated with user id %{user}. + notes: + delete_confirmation: Oletko varma, että haluat poistaa muistiinpanon '%{id}'? + delete_item_title: Poista + delete_note_confirm: Oletko varma että haluat poistaa muistiinpanon '%{id}'? + delete_note_title: Poista muistiinpano '%{id}' + deleted_note: Muistiinpano '%{id}' poistettu + edit_item_title: Muokkaa + in_project: 'Kuuluu: ' + no_notes_available: Muistiinpanoja ei löytynyt. Voit lisätä niitä projekteihin projektisivulta. + note_header: Muistiinpano %{id} + note_link_title: Show note %{id} + note_location_link: 'Kuuluu:' + save_status_message: Muistiinpano %{id} tallennettu + show_note_title: Show note + number: + currency: + format: + delimiter: " " + format: "%u%n" + precision: 2 + separator: "," + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros + unit: "€" + format: + delimiter: " " + precision: 3 + separator: "," + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros + human: + decimal_units: + format: "%n %u" + units: + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион + unit: "." + format: + delimiter: '' + precision: 1 + significant: 'true' + strip_insignificant_zeros: 'true' + storage_units: + format: "%n %u" + units: + byte: + one: Tavu + other: Tavua + gb: Gt + kb: kt + mb: Mt + tb: Tt + percentage: + format: + delimiter: '' + format: "%n%" + precision: + format: + delimiter: '' + preferences: + authentication_header: Your authentication + change_authentication_type: Change your authentication type + change_identity_url: Change Your Identity URL + change_password: Muuta salasanasi + current_authentication_type: Your authentication type is %{auth_type} + edit_preferences: Muokkaa asetuksia + generate_new_token: Luo uusi avainkoodi + generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. + is_false: 'false' + is_true: 'true' + open_id_url: Your OpenID URL is + page_title: TRACKS::Asetukset + page_title_edit: TRACKS::Muokkaa asetuksia + password_changed: Salasanasi on muutettu, kirjaudu uudelleen sisään. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + show_number_completed: Näytä %{number} valmista toimenpidettä + sms_context_none: Ei mikään + staleness_starts_after: Toimenpide alkaa vanhentumaan %{days} päivän kuluttua + tabs: + authentication: Authentication + date_and_time: Date and time + profile: Profile + remove_account: Remove account + tracks_behavior: Tracks behavior + title: Asetuksesi + token_description: Avainkoodi (syötteiden ja rajapinnan käyttämiseen) + token_header: Avainkoodisi + updated: Asetukset päivitetty + projects: + actions_in_project_title: Actions in this project + active_projects: Active projects + add_note: Add a note + add_note_submit: Add note + add_project: Add Project + all_completed_tasks_title: TRACKS::List All Completed Actions in Project '%{project_name}' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty + completed_projects: Completed projects + completed_tasks_title: TRACKS::List Completed Actions in Project '%{project_name}' + default_context: The default context for this project is %{context} + default_context_removed: Removed default context + default_context_set: Set project's default context to %{default_context} + default_tags_removed_notice: Removed the default tags + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty + delete_project: Delete project + delete_project_confirmation: Are you sure that you want to delete the project '%{name}'? + delete_project_title: Delete the project + edit_project_settings: Muokkaa projektin asetuksia + edit_project_title: Edit project + hidden_projects: Hidden projects hide_form: Piilota lomake - toggle_single: Lisää seuraava toimenpide + hide_form_title: Hide new project form + is_active: is active + last_completed_in_project: "(last %{number})" + list_completed_projects: TRACKS::List Completed Projects + list_projects: TRACKS::List Projects + list_reviews: TRACKS::Review + no_default_context: This project does not have a default context + no_last_completed_projects: Valmiita projekteja ei löytynyt + no_last_completed_recurring_todos: Valmiita toistuvia toimenpiteitä ei löytynyt + no_notes_attached: Currently there are no notes attached to this project + no_projects: Currently there are no projects + notes: Notes + notes_empty: There are no notes for this project + page_title: 'TRACKS::Project: %{project}' + project_destroyed_status: Deleted project '%{name}' + project_saved_status: Project saved + project_state: Project is %{state}. + set_default_tags_notice: Set project's default tags to %{default_tags} + settings: Settings + show_form: Add a project + show_form_title: Create a new project + state: Tämä projekti on %{state} + status_project_name_changed: Name of project was changed + this_project: This project + to_new_project_page: Take me to the new project page + was_marked_complete: has been marked as completed + was_marked_hidden: has been marked as hidden + with_default_context: with a default context of '%{context_name}' + with_default_tags: and with '%{tags}' as the default tags + with_no_default_context: with no default context + with_no_default_tags: and with no default tags + search: + contexts_matching_query: Contexts matching query + no_results: Your search yielded no results. + notes_matching_query: Notes matching query + projects_matching_query: Projects matching query + tags_matching_query: Tags matching query + todos_matching_query: Todos matching query + shared: add_action: Lisää toimenpide add_actions: Lisää toimenpiteitä add_context: Lisää asiayhteys - tags_for_all_actions: Asiasanat kaikille toimenpiteille (pilkulla erotettuna) - toggle_single_title: Lisää uusi seuraava toimenpide - project_for_all_actions: Projekti kaikille toimenpiteille context_for_all_actions: Asiayhteys kaikille toimenpiteille - toggle_multi: Lisää useita - separate_tags_with_commas: erota pilkulla - toggle_multi_title: Toggle single/multi new action form hide_action_form_title: Piilota toimenpiteen lisäyslomake + hide_form: Piilota lomake make_actions_dependent: Määritä toimenpiteet riippuvaisiksi toisistaan + multiple_next_actions: Useita seuraavia toimenpiteitä (omilla riveillään) + project_for_all_actions: Projekti kaikille toimenpiteille + separate_tags_with_commas: erota pilkulla + tags_for_all_actions: Asiasanat kaikille toimenpiteille (pilkulla erotettuna) + toggle_multi: Lisää useita + toggle_multi_title: Toggle single/multi new action form + toggle_single: Lisää seuraava toimenpide + toggle_single_title: Lisää uusi seuraava toimenpide + sidebar: + list_empty: Ei + list_name_active_contexts: Aktiiviset asiayhteydet + list_name_active_projects: Aktiiviset projektit + list_name_completed_projects: Valmiit projektit + list_name_hidden_contexts: Piilotetut asiayhteydet + list_name_hidden_projects: Piilotetut projektit states: + active: Aktiivinen + active_plural: Aktiivinen + blocked: Estetty + blocked_plural: Estetty + close: Suljettu + closed_plural: Suljettu + completed: Valmis + completed_plural: Valmis contexts: - hidden: Piilotetut asiayhteydet + ":": ":" active: Aktiiviset asiayhteydet closed: Suljetut asiayhteydet + hidden: Piilotetut asiayhteydet + current: Ajan tasalla + current_plural: Ajan tasalla + hidden: Piilotettu + hidden_plural: Piilotettu projects: + ":": ":" active: Aktiiviset projektit blocked: Estetyt closed: Suljetut projektit @@ -351,276 +665,340 @@ fi: hidden: Piilotetut projektit review: Käsittele stalled: Stalled - hidden_plural: Piilotettu - completed: Valmis - completed_plural: Valmis - visible_plural: Näkyvä - visible: Näkyvä - close: Suljettu - closed_plural: Suljettu - active_plural: Aktiivinen - hidden: Piilotettu - active: Aktiivinen - review_plural: Päivätty review: Päivätty - stalled_plural: Stalled + review_plural: Päivätty stalled: Stalled - blocked_plural: Estetty - blocked: Estetty - current_plural: Ajan tasalla - current: Ajan tasalla - layouts: - toggle_notes: Toggle notes - toggle_contexts: "Toggle collapsed contexts" - toggle_contexts_title: "Make collapsed contexts (in)visible" - next_actions_rss_feed: RSS feed of next actions - toggle_notes_title: Toggle all notes - mobile_navigation: - new_action: Uusi - logout: Kirjaudu ulos - feeds: Syötteet - full: Täysi sivusto - starred: Tähditetyt - projects: Projektit - tickler: Tulevat - contexts: Asiayhteydet - home: Etusivu - navigation: - manage_users_title: Lisää tai poista käyttäjiä - recurring_todos: Toistuvat toimenpiteet - api_docs: REST-rajapintadokumentaatio - feeds: Syötteet - starred: Tähdellä merkityt - notes_title: Näytä kaikki muistiinpanot - review_title: Make review - stats: Tilastot - tickler_title: Tulevat - manage_users: Hallitse käyttäjiä - export_title: Vie tietoja - import_title: Tuo tietoja - preferences: Asetukset - integrations_: Integroi Tracks - feeds_title: Näytä lista syötteistä - calendar_title: Kalenteri määräpäivistä - completed_tasks: Valmis - stats_title: Näytä tilastosi - tickler: Tulevat - home_title: Etusivu - starred_title: Näytä tähdellä merkityt toimenpiteesi - recurring_todos_title: Hallitse toistuvia toimenpiteitä - view: Näytä - organize: Järjestele - completed_tasks_title: Valmiit - home: Etusivu - export: Vie - import: Tuo - contexts_title: Asiayhteydet - calendar: Kalenteri - projects_title: Projektit - search: Hae kaikesta - preferences_title: Näytä asetukseni - admin: Ylläpito - help: "?" - help_page: Ohje - mobile: Mobiilisivusto - group_view_by_context: "Ryhmittele asiayhteyden mukaan" - group_view_by_project: "Ryhmittele projektin mukaan" - group_view_by_title: "Muuta sivun toimenpiteiden ryhmittelyä" - show_empty_containers_project: "Näytä tyhjät projektit" - show_empty_containers_context: "Näytä tyhjät asiayhteydet" - show_empty_containers_title: "Näytä tai piilota tyhjät asiayhteydet tai projektit" - options: Asetukset - footer: - send_feedback: Lähetä palautetta versiosta %{version} - sidebar: - list_name_active_contexts: Aktiiviset asiayhteydet - list_name_active_projects: Aktiiviset projektit - list_empty: Ei - list_name_completed_projects: Valmiit projektit - list_name_hidden_projects: Piilotetut projektit - list_name_hidden_contexts: Piilotetut asiayhteydet + stalled_plural: Stalled + visible: Näkyvä + visible_plural: Näkyvä + stats: + action_completion_time_title: Completion time (all completed actions) + action_selection_title: TRACKS::Action selection + actions: Actions + actions_30days_title: Actions in the last 30 days + actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions + actions_avg_completed: and completed an average of %{count} actions per month. + actions_avg_completed_30days: and completed an average of %{count} actions per day. + actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. + actions_avg_created: In the last 12 months you created on average %{count} actions + actions_day_of_week_legend: + day_of_week: Day of the week + number_of_actions: Number of actions + actions_day_of_week_title: Day of week (all actions) + actions_dow_30days_legend: + day_of_week: Day of the week + number_of_actions: Number of actions + actions_dow_30days_title: Day of week (past 30 days) + actions_further: " and further" + actions_last_year: Actions in the last years + actions_last_year_legend: + months_ago: Months ago + number_of_actions: Number of actions + 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 ' + 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} and further. + click_to_update_actions: Click on a bar in the chart to update the actions below. + contexts: Contexts + current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions + index_title: TRACKS::Tilastot + labels: + avg_completed: Avg completed + avg_created: Avg created + completed: Completed + created: Created + month_avg_completed: "%{months} Month avg completed" + month_avg_created: "%{months} Month avg created" + legend: + actions: Actions + day_of_week: Day of week + months_ago: Months ago + number_of_actions: Number of actions + number_of_days: Number of days ago + percentage: Percentage + running_time: Running time of an action (weeks) + more_stats_will_appear: More statistics will appear here once you have added some actions. + no_actions_selected: There are no actions selected. + no_tags_available: no tags available + open_per_week: Active (visible and hidden) next actions per week + open_per_week_legend: + actions: Actions + weeks: Weeks ago + other_actions_label: "(others)" + projects: Projects + running_time_all: Current running time of all incomplete actions + running_time_all_legend: + actions: Actions + percentage: Percentage + running_time: Running time of an action (weeks). Click on a bar for more info + running_time_legend: + actions: Actions + percentage: Percentage + weeks: Running time of an action (weeks). Click on a bar for more info + spread_of_actions_for_all_context: Spread of actions for all contexts + spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts + tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. + tag_cloud_90days_title: Tag cloud actions in past 90 days + tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) + tag_cloud_title: Tag cloud for all actions + tags: Tags + time_of_day: Time of day (all actions) + time_of_day_legend: + number_of_actions: Number of actions + time_of_day: Time of day + tod30: Time of day (last 30 days) + tod30_legend: + number_of_actions: Number of actions + time_of_day: Time of day + top10_longrunning: Top 10 longest running projects + top10_projects: Top 10 projects + top10_projects_30days: Top 10 project in past 30 days + top5_contexts: Top 5 contexts + top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions + totals: Totals + totals_action_count: you have a total of %{count} actions + 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_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_incomplete_actions: You have %{count} incomplete actions + totals_project_count: You have %{count} projects. + totals_tag_count: You have %{count} tags placed on actions. + totals_unique_tags: Of those tags, %{count} are unique. + totals_visible_context_count: Of those %{count} are visible contexts + within_one: Within 1 + support: + array: + last_word_connector: " ja " + two_words_connector: " ja " + words_connector: ", " + select: + prompt: Valitse + 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: '' + pm: pm todos: - no_actions: - hidden: Currently there are no hidden actions found - tag_hidden: Currently there are no hidden actions found - without_project: Currently there are no actions without a project - deferred_pending: "Currently there are no deferred or pending actions" - recurring_todos: Currently there are no recurring todos - completed: Currently there are no completed actions - title: Toimenpiteitä ei löytynyt - not_done_with_tag: "Tagilla '%{param}' merkittyjä keskeneräisiä toimenpiteitä ei löytynyt" - not_done_project: Tähän projektiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt - not_done_context: Tähän kontekstiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt - completed_recurring: Currently there are no completed recurring todos - not_done: Currently there are no incomplete actions - project: Currently there are no incomplete actions in this project - context: Currently there are no incomplete actions in this context - completed_today: No actions were completed today - completed_rest_of_week: No actions were completed in the rest of this week - completed_rest_of_month: No actions were completed in the rest of this month - due_today: No actions due today - due_this_week: No actions due this week - due_next_week: No actions due in next week - due_this_month: No actions due in rest of this month - due_after_this_month: No actions due after this month + action_deferred: The action '%{description}' was deferred + action_deleted_error: Failed to delete the action + action_deleted_success: Successfully deleted next action + action_due_on: "(määräaika %{date})" + action_marked_complete: The action '%{description}' was marked as %{completed} + action_marked_complete_error: The action '%{description}' was NOT marked as %{completed} due to an error on the server. + action_saved: Action saved + action_saved_to_tickler: Action saved to tickler actions: completed: Completed actions - home_completed: Completed actions - tag_completed: "Completed actions tagged with '%{param}'" - home_without_project: "Actions without project" - context_without_project: "Actions without project in %{param}" - project_project: "Actions in this project" - project_deferred_pending: Deferred/pending actions in this project - context_deferred_pending: Deferred/pending actions in this context - tag_deferred_pending: "Deferred/pending actions tagged with '%{param}'" - project_completed: Completed actions in this project context_completed: Completed actions in this context - tag_hidden: "Tagilla '%{param}' merkityt piilotetut toimenpiteet" - error: - invalid_due_date: "Invalid due date" - invalid_show_from_date: "Invalid show from date" - completed_today: Completed today - completed_rest_of_week: Completed in the rest of this week - completed_rest_of_month: Completed in the rest of this month - show_from: Show from - error_starring_recurring: "Could not toggle the star of recurring todo '%{description}'" - recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added - completed_recurring: Completed recurring todos - added_new_next_action: Added new next action - completed_rest_of_previous_month: Completed in the rest of the previous month - blocked_by: Blocked by %{predecessors} - star_action: Merkitse toimenpide tähdellä - completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed - defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. - unable_to_add_dependency: Unable to add dependency - done: Done? - star_action_with_description: "star the action '%{description}'" - tagged_with: "tagged with '%{tag_name}'" - completed: Completed - edit_action_with_description: "Edit the action '%{description}'" - action_due_on: (määräaika %{date}) - remove_dependency: Remove dependency (does not delete the action) - archived_tasks_title: TRACKS::Archived completed tasks - list_incomplete_next_actions: Lists incomplete next actions - tags: Tags (separate with commas) - action_deleted_success: Successfully deleted next action - new_related_todo_created: A new todo was added which belongs to this recurring todo - context_changed: Context changed to %{name} + context_deferred_pending: Deferred/pending actions in this context + context_without_project: Actions without project in %{param} + home_completed: Completed actions + home_without_project: Actions without project + project_completed: Completed actions in this project + project_deferred_pending: Deferred/pending actions in this project + project_project: Actions in this project + tag_completed: Completed actions tagged with '%{param}' + tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_hidden: Tagilla '%{param}' merkityt piilotetut toimenpiteet add_another_dependency: Add another dependency - mobile_todos_page_title: All actions - delete_recurring_action_title: Delete the recurring action - removed_predecessor: Removed %{successor} as dependency from %{predecessor}. - recurring_actions_title: TRACKS::Recurring Actions - next_action_needed: You need to submit at least one next action - action_saved: Action saved - scheduled_overdue: Scheduled to show %{days} days ago - action_deleted_error: Failed to delete the action - edit_action: Edit action + add_new_recurring: Lisää uusi toistuva toimenpide + added_dependency: Added %{dependency} as dependency. added_new_context: Added new context - next_actions_description: "Filter:" - list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions - set_to_pending: "%{task} set to pending" + added_new_next_action: Added new next action + added_new_next_action_plural: Added new next actions + added_new_next_action_singular: Added new next action added_new_project: Added new project + all_completed: All completed actions + all_completed_here: here + all_completed_tagged_page_title: TRACKS::All completed tasks with tag %{tag_name} + append_in_this_project: in this project + archived_tasks_title: TRACKS::Archived completed tasks + blocked_by: Blocked by %{predecessors} + calendar: + due_after_this_month: Tehtävä %{next_month} ja myöhemmin + due_next_week: Tehtävä ensi viikolla + due_this_month: Tehtävä loppukuukauden %{month} aikana + due_this_week: Tehtävä loppuviikon aikana + due_today: Tehtävä tänään + get_in_ical_format: Get this calendar in iCal format + calendar_page_title: TRACKS::Kalenteri + cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! + clear_due_date: Clear due date + clear_show_from_date: Clear show from date + completed: Completed + completed_actions: Completed actions + completed_actions_with: Completed actions with the tag '%{tag_name}' + completed_in_archive: + one: There is a completed action in the archive. + other: There are %{count} completed actions in the archive. + completed_last_day: Completed in the last 24 hours + completed_last_x_days: Completed in the last %{count} days + completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed + completed_recurring: Completed recurring todos + completed_recurring_actions_title: TRACKS::Completed recurring actions + completed_rest_of_month: Completed in the rest of this month + completed_rest_of_previous_month: Completed in the rest of the previous month + completed_rest_of_week: Completed in the rest of this week + completed_tagged_page_title: TRACKS::Completed tasks with tag '%{tag_name}' + completed_tasks_title: TRACKS::Completed tasks + completed_today: Completed today + confirm_delete: Are you sure that you want to delete the action '%{description}'? + context_changed: Context changed to %{name} + convert_to_project: Make project + defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. + defer_x_days: + one: Defer 1 day + other: Defer %{count} days + deferred_actions_with: Deferred actions with the tag '%{tag_name}' + deferred_pending_actions: Deferred/pending actions + deferred_tasks_title: TRACKS::Tulevat + delete: Delete + delete_action: Delete action + delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'? + delete_recurring_action_title: Delete the recurring action + deleted_success: The action was deleted successfully. + depends_on: Depends on + depends_on_separate_with_commas: Depends on (separate with commas) + done: Done? + drag_action_title: Drag onto another action to mark that action as a dependency for this action. + due: Due + edit: Edit + edit_action: Edit action + edit_action_with_description: Edit the action '%{description}' + edit_recurring_todo: Muokkaa toistuvaa toimenpidettä + error: + invalid_due_date: Invalid due date + invalid_show_from_date: Invalid show from date + error_completing_todo: There was an error completing / activating the recurring todo %{description} + error_deleting_item: There was an error deleting the item %{description} + error_deleting_recurring: There was an error deleting the recurring todo '%{description}' + error_removing_dependency: There was an error removing the dependency + error_saving_recurring: There was an error saving the recurring todo '%{description}' + error_starring: Could not toggle the star of this todo '%{description}' + error_starring_recurring: Could not toggle the star of recurring todo '%{description}' + error_toggle_complete: Could not mark this todo complete + feed_title_in_context: in context '%{context}' + feed_title_in_project: in project '%{project}' + feeds: + completed: 'Completed: %{date}' + due: 'Due: %{date}' + has_x_pending: + one: Has one pending action + other: Has %{count} pending actions + hidden_actions: Hidden actions + in_hidden_state: in hidden state + in_pending_state: in pending state + list_incomplete_next_actions: Lists incomplete next actions + list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions + mark_complete: Merkitse valmiiksi + mobile_todos_page_title: All actions + new_related_todo_created: A new todo was added which belongs to this recurring todo + new_related_todo_created_short: created a new todo + new_related_todo_not_created_short: did not create todo + next_action_description: Next action description + next_action_needed: You need to submit at least one next action + next_actions_description: 'Filter:' + next_actions_description_additions: + completed: in the last %{count} days + due_date: with a due date %{due_date} or earlier + next_actions_due_date: + due_in_x_days: Määräaika %{days} päivän päästä + due_today: Tehtävä tänään + due_tomorrow: Tehtävä huomenna + overdue_by: Myöhässä %{days} päivää + overdue_by_plural: Myöhässä %{days} päivää + next_actions_title: Tracks - Next Actions next_actions_title_additions: completed: actions completed due_today: due today due_within_a_week: due within a week - append_in_this_project: in this project - error_deleting_item: There was an error deleting the item %{description} - task_list_title: TRACKS::List tasks + no_actions: + completed: Currently there are no completed actions + completed_recurring: Currently there are no completed recurring todos + completed_rest_of_month: No actions were completed in the rest of this month + completed_rest_of_week: No actions were completed in the rest of this week + completed_today: No actions were completed today + context: Currently there are no incomplete actions in this context + deferred_pending: Currently there are no deferred or pending actions + due_after_this_month: No actions due after this month + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_this_week: No actions due this week + due_today: No actions due today + hidden: Currently there are no hidden actions found + not_done: Currently there are no incomplete actions + not_done_context: Tähän kontekstiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt + not_done_project: Tähän projektiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt + not_done_with_tag: Tagilla '%{param}' merkittyjä keskeneräisiä toimenpiteitä ei löytynyt + project: Currently there are no incomplete actions in this project + recurring_todos: Currently there are no recurring todos + tag_hidden: Currently there are no hidden actions found + title: Toimenpiteitä ei löytynyt + without_project: Currently there are no actions without a project no_actions_due_this_week: No actions due in rest of this week - error_completing_todo: There was an error completing / activating the recurring todo %{description} - recurring_pattern_removed: The recurrence pattern is removed from %{count} - convert_to_project: Make project - delete_recurring_action_confirm: "Are you sure that you want to delete the recurring action '%{description}'?" - completed_last_day: Completed in the last 24 hours - show_in_days: Näytetään %{days} päivän kuluttua - no_project: --No project-- - error_saving_recurring: "There was an error saving the recurring todo '%{description}'" - new_related_todo_created_short: created a new todo - all_completed: All completed actions - feed_title_in_context: "in context '%{context}'" - completed_tagged_page_title: "TRACKS::Completed tasks with tag '%{tag_name}'" - edit: Edit - pending: Odottaa - completed_actions_with: "Completed actions with the tag '%{tag_name}'" - deleted_success: The action was deleted successfully. - completed_tasks_title: TRACKS::Completed tasks - feed_title_in_project: "in project '%{project}'" - clear_due_date: Clear due date - hidden_actions: Hidden actions - error_removing_dependency: There was an error removing the dependency - was_due_on_date: was due on %{date} - show_on_date: Show on %{date} - recurrence_period: Toistuvuusjakso - deferred_actions_with: "Deferred actions with the tag '%{tag_name}'" - recurring_deleted_success: The recurring action was deleted successfully. - confirm_delete: "Are you sure that you want to delete the action '%{description}'?" - deferred_tasks_title: TRACKS::Tulevat - next_actions_title: Tracks - Next Actions - next_action_description: Next action description - clear_show_from_date: Clear show from date - calendar_page_title: TRACKS::Kalenteri - unresolved_dependency: The value you entered in the dependency field did not resolve to an existing action. This value will not be saved with the rest of the action. Continue? - in_hidden_state: in hidden state - show_today: Show Today - next_actions_due_date: - overdue_by: Myöhässä %{days} päivää - due_today: Tehtävä tänään - due_in_x_days: Määräaika %{days} päivän päästä - overdue_by_plural: Myöhässä %{days} päivää - due_tomorrow: Tehtävä huomenna - completed_last_x_days: Completed in the last %{count} days - defer_x_days: - one: Defer 1 day - other: Defer %{count} days - added_new_next_action_singular: Added new next action - feeds: - completed: "Completed: %{date}" - due: "Due: %{date}" - deferred_pending_actions: Deferred/pending actions - has_x_pending: - one: Has one pending action - other: Has %{count} pending actions - delete_action: Delete action - error_deleting_recurring: "There was an error deleting the recurring todo '%{description}'" - recurring_todos: Toistuvat toimenpiteet - delete: Delete - cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! - drag_action_title: Drag onto another action to mark that action as a dependency for this action. + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with no_last_completed_actions: No completed actions found - depends_on: Depends on - 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." - action_marked_complete: "The action '%{description}' was marked as %{completed}" - added_new_next_action_plural: Added new next actions - new_related_todo_not_created_short: did not create todo - error_starring: "Could not toggle the star of this todo '%{description}'" - calendar: - get_in_ical_format: Get this calendar in iCal format - due_today: Tehtävä tänään - due_this_week: Tehtävä loppuviikon aikana - due_next_week: Tehtävä ensi viikolla - due_this_month: Tehtävä loppukuukauden %{month} aikana - due_after_this_month: Tehtävä %{next_month} ja myöhemmin - show_tomorrow: Show Tomorrow - tagged_page_title: "TRACKS::Tagged with '%{tag_name}'" - action_deferred: "The action '%{description}' was deferred" - mark_complete: Merkitse valmiiksi + no_project: "--No project--" + no_recurring_todos: No recurring todos + notes: Notes + overdue: Overdue + pending: Odottaa recurrence: - ends_on_number_times: Päättyy %{number} toiston jälkeen - ends_on_date: Päättyy %{date} - every_work_day: Joka työpäivä - weekly_options: Asetukset viikottain toistuville toimenpiteille - weekly: Viikottain - monthly_options: Asetukset kuukausittain toistuville toimenpiteille - starts_on: Alkaa + daily: Päivittäin + daily_every_number_day: Joka %{number} päivä daily_options: Asetukset päivittäin toistuville toimenpiteille + day_x_on_every_x_month: Day %{day} on every %{month} month + ends_on: Päättyy + ends_on_date: Päättyy %{date} + ends_on_number_times: Päättyy %{number} toiston jälkeen + every_work_day: Joka työpäivä monthly: Kuukausittain + monthly_every_xth_day: The %{day} %{day_of_week} of every %{month} month + monthly_options: Asetukset kuukausittain toistuville toimenpiteille + no_end_date: Ei päättymispäivää pattern: + day_names: + - sunnuntai + - maanantai + - tiistai + - keskiviikko + - torstai + - perjantai + - lauantai + due: due + every_day: joka päivä + every_month: every month + every_n: joka %{n} + every_n_days: joka %{n} päivä + every_n_months: joka %{n} kuukausi + every_xth_day_of_every_n_months: every %{x} %{day} of every %{n_months} + every_year_on: every year on %{date} + first: ensimmäinen + fourth: fourth + from: from + last: last month_names: - - + - - Tammikuu - Helmikuu - Maaliskuu @@ -633,405 +1011,121 @@ fi: - Lokakuu - Marraskuu - Joulukuu - third: kolmas - every_n: joka %{n} - every_n_days: joka %{n} päivä - every_n_months: joka %{n} kuukausi - every_day: joka päivä on_day_n: on day %{n} - second: sekunti - every_xth_day_of_every_n_months: every %{x} %{day} of every %{n_months} - from: from - weekly: viikottain - last: last - the_xth_day_of_month: the %{x} %{day} of %{month} - times: for %{number} times on_work_days: työpäivinä - first: ensimmäinen - every_year_on: every year on %{date} - day_names: - - sunnuntai - - maanantai - - tiistai - - keskiviikko - - torstai - - perjantai - - lauantai + second: sekunti show: show - fourth: fourth - due: due + the_xth_day_of_month: the %{x} %{day} of %{month} + third: kolmas + times: for %{number} times until: until - every_month: every month - daily: Päivittäin - yearly_every_x_day: Joka %{month} %{day} + weekly: viikottain recurrence_on: - options: Käytä laskettua päivää due_date: toimenpiteen määräpäivän asettamiseen - show_options: Näytä toimenpide - show_always: aina - show_days_before: "vasta %{days} päivä(ä) ennen määräpäivää" from_tickler: toimenpiteen näyttämispäivän asettamiseen (älä aseta määräpäivää) - daily_every_number_day: Joka %{number} päivä + options: Käytä laskettua päivää + show_always: aina + show_days_before: vasta %{days} päivä(ä) ennen määräpäivää + show_options: Näytä toimenpide + starts_on: Alkaa + weekly: Viikottain weekly_every_number_week: Returns every %{number} week on - ends_on: Päättyy - no_end_date: Ei päättymispäivää - day_x_on_every_x_month: Day %{day} on every %{month} month - yearly_options: Settings for yearly recurring actions - yearly_every_xth_day: The %{day} %{day_of_week} of %{month} - monthly_every_xth_day: The %{day} %{day_of_week} of every %{month} month + weekly_options: Asetukset viikottain toistuville toimenpiteille yearly: Vuosittain - added_dependency: Added %{dependency} as dependency. - all_completed_tagged_page_title: TRACKS::All completed tasks with tag %{tag_name} + yearly_every_x_day: Joka %{month} %{day} + yearly_every_xth_day: The %{day} %{day_of_week} of %{month} + yearly_options: Settings for yearly recurring actions recurrence_completed: There is no next action after the recurring action you just finished. The recurrence is completed - error_toggle_complete: Could not mark this todo complete - in_pending_state: in pending state - due: Due - action_marked_complete_error: "The action '%{description}' was NOT marked as %{completed} due to an error on the server." - depends_on_separate_with_commas: Depends on (separate with commas) - action_saved_to_tickler: Action saved to tickler + recurrence_period: Toistuvuusjakso + recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added recurring_action_saved: Recurring action saved - completed_in_archive: - one: There is a completed action in the archive. - other: There are %{count} completed actions in the archive. - to_tickler: to tickler - next_actions_description_additions: - completed: in the last %{count} days - due_date: with a due date %{due_date} or earlier - overdue: Overdue - add_new_recurring: Lisää uusi toistuva toimenpide - edit_recurring_todo: Muokkaa toistuvaa toimenpidettä + recurring_actions_title: TRACKS::Recurring Actions + recurring_deleted_success: The recurring action was deleted successfully. + recurring_pattern_removed: The recurrence pattern is removed from %{count} + recurring_todos: Toistuvat toimenpiteet + remove_dependency: Remove dependency (does not delete the action) + removed_predecessor: Removed %{successor} as dependency from %{predecessor}. + scheduled_overdue: Scheduled to show %{days} days ago see_all_completed: You can see all completed actions %{link} - all_completed_here: here - completed_recurring_actions_title: 'TRACKS::Completed recurring actions' - contexts: - delete_context_title: Poista asiayhteys - all_completed_tasks_title: "TRACKS::All Completed actions in the context '%{context_name}'" - hide_form: Piilota lomake - show_form_title: Lisää asiayhteys - delete_context_confirmation: "Are you sure that you want to delete the context '%{name}'? Be aware that this will also delete all (recurring) actions in this context!" - delete_context: Poista asiayhteys - edit_context: Muokkaa asiayhteyttä - hide_form_title: Piilota asiayhteyden lisäyslomake - context_hide: Piilota etusivulta? - context_state: Asiayhteyden tila - hidden_contexts: Piilotetut asiayhteydet - no_contexts_active: Currently there are no active contexts - no_contexts_closed: Currently there are no closed contexts - show_form: Luo uusi asiayhteys - visible_contexts: Näkyvät asiayhteydet - save_status_message: Asiayhteys tallennettu - add_context: Lisää asiayhteys - context_name: Asiayhteyden nimi - update_status_message: Name of context was changed - completed_tasks_title: "TRACKS::Completed actions in the context '%{context_name}'" - new_context_post: "' will be also created. Are you sure?" - status_active: Context is active - last_completed_in_context: "(last %{number})" - context_deleted: "Deleted context '%{name}'" - no_contexts_hidden: Currently there are no hidden contexts - new_context_pre: New context ' - status_hidden: Context is hidden - todos_append: in this context - projects: - was_marked_hidden: has been marked as hidden - edit_project_title: Edit project - default_tags_removed_notice: Removed the default tags - default_context_set: Set project's default context to %{default_context} - all_completed_tasks_title: "TRACKS::List All Completed Actions in Project '%{project_name}'" - hide_form: Piilota lomake - page_title: "TRACKS::Project: %{project}" - show_form_title: Create a new project - list_completed_projects: TRACKS::List Completed Projects - to_new_project_page: Take me to the new project page - no_notes_attached: Currently there are no notes attached to this project - this_project: This project - project_state: Project is %{state}. - last_completed_in_project: (last %{number}) - no_last_completed_projects: Valmiita projekteja ei löytynyt - notes: Notes - no_last_completed_recurring_todos: Valmiita toistuvia toimenpiteitä ei löytynyt - notes_empty: There are no notes for this project - no_projects: Currently there are no projects - hide_form_title: Hide new project form - with_no_default_context: with no default context - delete_project: Delete project - show_form: Add a project - actions_in_project_title: Actions in this project - delete_project_confirmation: "Are you sure that you want to delete the project '%{name}'?" - with_default_context: "with a default context of '%{context_name}'" - set_default_tags_notice: Set project's default tags to %{default_tags} - is_active: is active - settings: Settings - completed_projects: Completed projects - with_default_tags: "and with '%{tags}' as the default tags" - list_projects: TRACKS::List Projects - list_reviews: TRACKS::Review - project_saved_status: Project saved - project_destroyed_status: "Deleted project '%{name}'" - add_project: Add Project - add_note: Add a note - completed_tasks_title: "TRACKS::List Completed Actions in Project '%{project_name}'" - delete_project_title: Delete the project - hidden_projects: Hidden projects - add_note_submit: Add note - was_marked_complete: has been marked as completed - default_context_removed: Removed default context - default_context: The default context for this project is %{context} - status_project_name_changed: Name of project was changed - active_projects: Active projects - no_default_context: This project does not have a default context - with_no_default_tags: and with no default tags - edit_project_settings: Muokkaa projektin asetuksia - state: Tämä projekti on %{state} - notes: - delete_confirmation: "Oletko varma, että haluat poistaa muistiinpanon '%{id}'?" - delete_item_title: Poista - delete_note_title: "Poista muistiinpano '%{id}'" - note_link_title: Show note %{id} - show_note_title: Show note - deleted_note: "Muistiinpano '%{id}' poistettu" - edit_item_title: Muokkaa - note_location_link: "Kuuluu:" - no_notes_available: "Muistiinpanoja ei löytynyt. Voit lisätä niitä projekteihin projektisivulta." - note_header: Muistiinpano %{id} - delete_note_confirm: "Oletko varma että haluat poistaa muistiinpanon '%{id}'?" - in_project: "Kuuluu: " - save_status_message: "Muistiinpano %{id} tallennettu" - integrations: - opensearch_description: Search in Tracks - preferences: - open_id_url: Your OpenID URL is - staleness_starts_after: Toimenpide alkaa vanhentumaan %{days} päivän kuluttua - change_identity_url: Change Your Identity URL - change_password: Muuta salasanasi - password_changed: Salasanasi on muutettu, kirjaudu uudelleen sisään. - updated: Asetukset päivitetty - page_title: TRACKS::Asetukset - title: Asetuksesi - token_description: Avainkoodi (syötteiden ja rajapinnan käyttämiseen) - is_false: "false" - show_number_completed: Näytä %{number} valmista toimenpidettä - page_title_edit: TRACKS::Muokkaa asetuksia - is_true: "true" - edit_preferences: Muokkaa asetuksia - sms_context_none: Ei mikään - generate_new_token: Luo uusi avainkoodi - token_header: Avainkoodisi - authentication_header: Your authentication - current_authentication_type: Your authentication type is %{auth_type} - change_authentication_type: Change your authentication type - tabs: - authentication: Authentication - tracks_behavior: Tracks behavior - profile: Profile - date_and_time: Date and time - generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. - data: - import_successful: Tuonti onnistui - import_errors: Some errors occurred during import - import_destination_invalid: Invalid import destination - stats: - index_title: TRACKS::Tilastot - within_one: Within 1 - tag_cloud_title: Tag cloud for all actions - tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) - tag_cloud_90days_title: Tag cloud actions in past 90 days - actions: Actions - totals_active_project_count: Of those %{count} are active projects - actions_last_year_legend: - number_of_actions: Number of actions - months_ago: Months ago - totals_first_action: Since your first action on %{date} - actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. - top10_longrunning: Top 10 longest running projects - actions_dow_30days_title: Day of week (past 30 days) - legend: - actions: Actions - number_of_days: Number of days ago - number_of_actions: Number of actions - day_of_week: Day of week - percentage: Percentage - running_time: Running time of an action (weeks) - months_ago: Months ago - current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions - open_per_week: Active (visible and hidden) next actions per week - open_per_week_legend: - actions: Actions - weeks: Weeks ago - totals_deferred_actions: "of which %{count} are deferred actions in the tickler" - running_time_legend: - actions: Actions - percentage: Percentage - weeks: Running time of an action (weeks). Click on a bar for more info - totals_action_count: you have a total of %{count} actions - totals_incomplete_actions: You have %{count} incomplete actions - totals_unique_tags: Of those tags, %{count} are unique. - actions_avg_completed_30days: and completed an average of %{count} actions per day. - top5_contexts: Top 5 contexts - actions_lastyear_title: Actions in the last 12 months - totals_actions_completed: "%{count} of these are completed." - totals_context_count: You have %{count} contexts. - totals_visible_context_count: Of those %{count} are visible contexts - totals_blocked_actions: "%{count} are dependent on the completion of their actions." - projects: Projects - action_completion_time_title: Completion time (all completed actions) - actions_last_year: Actions in the last years - actions_min_max_completion_days: The Min-/maximum days to complete is %{min}/%{max}. - tags: Tags - actions_min_completion_time: The minimum time to complete is %{time}. - no_tags_available: no tags available - actions_day_of_week_title: Day of week (all actions) - totals_project_count: You have %{count} projects. - running_time_all: Current running time of all incomplete actions - actions_30days_title: Actions in the last 30 days - time_of_day: Time of day (all actions) - totals_hidden_project_count: "%{count} are hidden" - tod30: Time of day (last 30 days) - tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. - more_stats_will_appear: More statistics will appear here once you have added some actions. - top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions - actions_further: " and further" - totals_tag_count: You have %{count} tags placed on actions. - top10_projects_30days: Top 10 project in past 30 days - spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts - actions_selected_from_week: "Actions selected from week " - spread_of_actions_for_all_context: Spread of actions for all contexts - click_to_show_actions_from_week: Click %{link} to show the actions from week %{week} and further. - other_actions_label: (others) - top10_projects: Top 10 projects - totals_completed_project_count: and %{count} are completed projects. - actions_avg_created: In the last 12 months you created on average %{count} actions - click_to_return: Click %{link} to return to the statistics page. - actions_avg_completed: and completed an average of %{count} actions per month. - totals: Totals - time_of_day_legend: - number_of_actions: Number of actions - time_of_day: Time of day - contexts: Contexts - click_to_return_link: here - totals_hidden_context_count: and %{count} are hidden contexts. - labels: - month_avg_completed: "%{months} Month avg completed" - completed: Completed - month_avg_created: "%{months} Month avg created" - avg_created: Avg created - avg_completed: Avg completed - created: Created - running_time_all_legend: - actions: Actions - percentage: Percentage - running_time: Running time of an action (weeks). Click on a bar for more info - click_to_update_actions: Click on a bar in the chart to update the actions below. - no_actions_selected: There are no actions selected. - actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions - actions_dow_30days_legend: - number_of_actions: Number of actions - day_of_week: Day of the week - actions_day_of_week_legend: - number_of_actions: Number of actions - day_of_week: Day of the week - tod30_legend: - number_of_actions: Number of actions - time_of_day: Time of day - action_selection_title: TRACKS::Action selection + set_to_pending: "%{task} set to pending" + show_from: Show from + show_in_days: Näytetään %{days} päivän kuluttua + show_on_date: Show on %{date} + show_today: Show Today + show_tomorrow: Show Tomorrow + star_action: Merkitse toimenpide tähdellä + star_action_with_description: star the action '%{description}' + tagged_page_title: TRACKS::Tagged with '%{tag_name}' + tagged_with: tagged with '%{tag_name}' + tags: Tags (separate with commas) + 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." + 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 to an existing action. This value will not be saved with the rest of the action. Continue? + was_due_on_date: was due on %{date} users: - successfully_deleted_user: Successfully deleted user %{username} - failed_to_delete_user: Failed to delete user %{username} - total_contexts: Total contexts - first_user_heading: "Welcome to TRACKS. To get started, please create an admin account:" - openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. - auth_type_update_error: "There was a problem updating your authentication type: %{error_messages}" - destroy_successful: User %{login} was successfully destroyed - new_token_generated: New token successfully generated - total_projects: Total projects - signup_successful: Signup successful for user %{username}. - change_password_submit: Change password - no_signups_title: TRACKS::Ei rekisteröitymisiä - user_created: User created. - manage_users: Manage users account_signup: Account signup - password_updated: Password updated. - desired_login: Desired login - signup: Signup - confirm_password: Confirm password - new_user_heading: "Sign up a new user:" - auth_type_updated: Authentication type updated. - total_actions: Total actions - change_password_title: TRACKS::Change password - change_auth_type_title: TRACKS::Change authentication type - change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. - password_confirmation_label: Confirm password - destroy_error: There was an error deleting the user %{login} - choose_password: Choose password - register_with_cas: With your CAS username - label_auth_type: Authentication type - new_password_label: New password - you_have_to_reset_your_password: "You have to reset your password" - first_user_title: TRACKS::Sign up as the admin user - new_user_title: TRACKS::Sign up - destroy_user: Destroy user - total_users_count: You have a total of %{count} users - destroy_confirmation: "Warning: this will delete user '%{login}', all their actions, contexts, project and notes. Are you sure that you want to continue?" - signup_new_user: Sign up new user - openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. - identity_url: Identity URL + approve_tos: I approve the Terms of Service auth_change_submit: Change authentication type + auth_type_update_error: 'There was a problem updating your authentication type: %{error_messages}' + auth_type_updated: Authentication type updated. + change_auth_type_title: TRACKS::Change authentication type change_authentication_type: Change authentication type - total_notes: Total notes + change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. + change_password_submit: Change password + change_password_title: TRACKS::Change password + choose_password: Choose password + confirm_password: Confirm password + desired_login: Desired login + destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their actions, contexts, project and notes. Are you sure that you want to continue?' + destroy_error: There was an error deleting the user %{login} + destroy_successful: User %{login} was successfully destroyed + destroy_user: Destroy user + email_address: Email address + failed_to_delete_user: Failed to delete user %{username} + first_user_heading: 'Welcome to TRACKS. To get started, please create an admin account:' + first_user_title: TRACKS::Sign up as the admin user + identity_url: Identity URL + label_auth_type: Authentication type + manage_users: Manage users + new_password_label: New password + new_token_generated: New token successfully generated + new_user_heading: 'Sign up a new user:' + new_user_title: TRACKS::Sign up + no_signups_title: TRACKS::Ei rekisteröitymisiä + openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. + openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. + password_confirmation_label: Confirm password + password_updated: Password updated. + register_with_cas: With your CAS username select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. - feedlist: - choose_context: Choose the context you want a feed of - actions_due_today: Actions due today or earlier - rss_feed: RSS Feed - ical_feed: iCal feed - all_contexts: All Contexts - legend: "Legend:" - all_projects: All Projects - choose_project: Choose the project you want a feed of - select_feed_for_project: Select the feed for this project - active_projects_wo_next: Active projects with no next actions - project_needed: There needs to be at least one project before you can request a feed - active_starred_actions: All starred, active actions - select_feed_for_context: Select the feed for this context - projects_and_actions: Active projects with their actions - context_needed: There needs to be at least one context before you can request a feed - actions_due_next_week: Actions due in 7 days or earlier - notice_incomplete_only: "Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page" - all_actions: All actions - actions_completed_last_week: Actions completed in the last 7 days - context_centric_actions: Feeds for incomplete actions in a specific context - plain_text_feed: Plain Text Feed - last_fixed_number: Last %{number} actions - project_centric: Feeds for incomplete actions in a specific project - login: - login_cas: go to the CAS - sign_in: Sign in - openid_identity_url_not_found: "Sorry, no user by that identity URL exists (%{identity_url})" - user_no_expiry: Stay logged in - cas_no_user_found: "Hello, %{username}! You do not have an account on Tracks." - cas_login: CAS Login - successful_with_session_info: "Login successful:" - please_login: Please log in to use Tracks - cas_logged_in_greeting: "Hello, %{username}! You are authenticated." - cas_username_not_found: "Sorry, no user by that CAS username exists (%{username})" - mobile_use_openid: "…or login with an OpenID" - cas_create_account: If you like to request on please go here to %{signup_link} - account_login: Account login - cas_signup_link: Request account - session_will_not_expire: session will not expire. - successful: Logged in successfully. Welcome back! - option_separator: or, - session_time_out: Session has timed out. Please %{link} - session_will_expire: "session will expire after %{hours} hour(s) of inactivity." - login_standard: go back to the standard login - logged_out: You have been logged out of Tracks. - login_with_openid: login with an OpenID - unsuccessful: Login unsuccessful. - log_in_again: log in again. - search: - contexts_matching_query: Contexts matching query - tags_matching_query: Tags matching query - notes_matching_query: Notes matching query - no_results: Your search yielded no results. - todos_matching_query: Todos matching query - projects_matching_query: Projects matching query + signup: Signup + signup_new_user: Sign up new user + signup_successful: Signup successful for user %{username}. + successfully_deleted_user: Successfully deleted user %{username} + tos_link: read the Terms of Service + total_actions: Total actions + total_contexts: Total contexts + total_notes: Total notes + total_projects: Total projects + total_users_count: You have a total of %{count} users + user_created: User created. + you_have_to_reset_your_password: You have to reset your password + will_paginate: + next_label: След → + page_entries_info: + multi_page: Отображено %{model} %{from} - %{to} из %{count} + multi_page_html: Отображено %{model} %{from} - %{to} из %{count} + single_page: + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} + zero: "%{model} не найдено" + single_page_html: + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} + zero: "%{model} не найдено" + page_gap: "…" + previous_label: "← Пред" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9e8371f4..e67648d8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -14,12 +14,9 @@ fr: mobile_todos_per_page: Actions par page (vue mobile) refresh: Intervalle de rafraîchissement (en minutes) review_period: Intervalle de revue de projet - show_completed_projects_in_sidebar: Montrer les projets complétés dans le - panneau latéral - show_hidden_contexts_in_sidebar: Montrer les contextes cachés dans le panneau - latéral - show_hidden_projects_in_sidebar: Montrer les projets cachés dans le panneau - latéral + show_completed_projects_in_sidebar: Montrer les projets complétés dans le panneau latéral + show_hidden_contexts_in_sidebar: Montrer les contextes cachés dans le panneau latéral + show_hidden_projects_in_sidebar: Montrer les projets cachés dans le panneau latéral show_number_completed: Montrer le nombre d'actions complétées show_project_on_todo_done: Aller au projet quand la tâche est terminée sms_context: Contexte email par défaut @@ -31,21 +28,27 @@ 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: + auth_type: Auth type + display_name: Display name + email: Email address first_name: Prénom last_name: Nom + login: Login + open_id_url: OpenID URL + password: Password errors: full_messages: format: "%{attribute} %{message}" @@ -66,6 +69,9 @@ fr: not_a_number: n'est pas un nombre odd: doit être impair record_invalid: 'La validation a échoué : %{errors}' + restrict_dependent_destroy: + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее taken: est déjà pris too_long: est trop long (maximum de %{count} caractères) too_short: est trop court (minimum de %{count} charactères) @@ -119,13 +125,13 @@ fr: months: Mois next: Suivant none: Aucun + not_available_abbr: n/a note: one: 1 note other: "%{count} notes" zero: non notes notes: Notes - not_available_abbr: n/a - numbered_step: "Étape %{number}" + numbered_step: Étape %{number} ok: OK optional: optionnel previous: Précédente @@ -139,13 +145,11 @@ 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 @@ -161,9 +165,9 @@ fr: context_deleted: Contexte «?%{name}?» supprimé context_hide: Caché de la première page ? context_name: Nom du Contexte + context_state: Context state 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 @@ -172,7 +176,9 @@ fr: last_completed_in_context: dans ce contexte (dernier %{number}) new_context_post: "?» sera aussi créé. Êtes-vous sûr ?" new_context_pre: Le contexte «? + no_contexts_: 'No contexts ' no_contexts_active: Actuellement, il n'y a pas de contextes actifs + no_contexts_closed: Currently there are no closed contexts no_contexts_hidden: Actuellement, il n'y a pas de contextes cachés save_status_message: Contexte sauvegardé show_form: Créer un nouveau contexte @@ -183,8 +189,10 @@ fr: update_status_message: Le nom du contexte a été modifié visible_contexts: Contextes visibles data: + import_destination_invalid: Invalid import destination import_errors: Des erreurs se sont produites durant l'importation. import_successful: L'import a réussi. + invalid_import_destination: Invalid import destination date: abbr_day_names: - dim @@ -287,27 +295,34 @@ fr: second: Seconde year: Année errors: + format: "%{attribute} %{message}" messages: + accepted: должен быть подтвержден blank: ne peut pas être absent + confirmation: не соответствует %{attribute} empty: ne peut pas être vide equal_to: doit être égal à %{count} even: doit être pair exclusion: est réservé greater_than: doit être supérieur à %{count} greater_than_or_equal_to: doit être supérieur ou égal à %{count} + inclusion: не входит в список invalid: est invalide less_than: doit être inférieur à %{count} less_than_or_equal_to: doit être inférieur ou égal à %{count} - not_an_integer: doit être un entier not_a_number: n'est pas un nombre + not_an_integer: doit être un entier odd: doit être impair + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято too_long: est trop long (%{count} caractères maximum) too_short: est trop court (%{count} caractères minimum) + wrong_length: неверной длины (должно быть %{count} символов) user_unauthorized: '401 Non autorisé : Administrateur seulement.' feedlist: actions_completed_last_week: Actions réalisées dans les 7 derniers jours - actions_due_next_week: Actions devant se terminer dans les 7 prochains jours ou - moins + actions_due_next_week: Actions devant se terminer dans les 7 prochains jours ou moins actions_due_today: Actions devant se terminer aujourd'hui ou avant active_projects_wo_next: Projets actifs sans action suivante active_starred_actions: Toutes les actions préferrées actives @@ -321,12 +336,11 @@ fr: ical_feed: Flux iCal last_fixed_number: Dernières %{number} actions legend: Légende - notice_incomplete_only: 'N.B. : Les flux ne montrent que les actions incomplètes, - sauf indication contraire' + notice_incomplete_only: 'N.B. : Les flux ne montrent que les actions incomplètes, sauf indication contraire' plain_text_feed: Flux texte - projects_and_actions: Projets actifs et leurs actions project_centric: Flux des actions incomplètes d'un projet spécifique project_needed: Il faut au moins un projet pour le flux + projects_and_actions: Projets actifs et leurs actions rss_feed: Flux RSS select_feed_for_context: Selectionner un flux pour ce contexte select_feed_for_project: Selectionner le flux pour ce projet @@ -343,6 +357,7 @@ fr: opensearch_description: Rechercher dans Tracks layouts: mobile_navigation: + calendar: Calendar contexts: Contextes feeds: Flux full: Site en version complète @@ -351,7 +366,7 @@ fr: new_action: 0-Nouvelle action projects: Projets starred: Favoris - tickler: "Échéancier" + tickler: Échéancier navigation: admin: Administration api_docs: API REST @@ -364,14 +379,21 @@ fr: export_title: Importer et exporter des données feeds: Flux feeds_title: Voir une liste des flux disponibles + group_view_by_context: Group by context + group_view_by_project: Group by project + group_view_by_title: Change the grouping of the actions on this page help: "?" + help_page: Help home: Accueil home_title: Accueil + import: Import + import_title: Import data integrations_: Intégrer Tracks manage_users: Gestion des utilisateurs manage_users_title: Ajouter ou supprimer des utilisateurs mobile: Site en version mobile notes_title: Voir toutes les notes + options: Options organize: Organiser preferences: Préférences preferences_title: Voir mes préférences @@ -380,12 +402,15 @@ fr: recurring_todos_title: Gerer les actions récurrentes review_title: Faire examiner search: Recherches tous les items + show_empty_containers_context: Show empty contexts + show_empty_containers_project: Show empty projects + show_empty_containers_title: Show or hide the empty projects or contexts starred: Favoris 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é @@ -400,52 +425,55 @@ fr: cas_no_user_found: Bonjour, %{username} ! Vous n'avez pas de compte sur Tracks. cas_signup_link: Demander un compte cas_username_not_found: Désolé, aucun utilisateur avec ce nom CAS n'existe (%{username}) + log_in_again: Se reconnecter logged_out: Vous avez été déconnecté de Tracks. login_cas: Aller au CAS login_standard: retourner à l'écran de connexion standard login_with_openid: se connecter avec un OpenID - log_in_again: Se reconnecter 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}) + openid_identity_url_not_found: Désolé, aucun utilisateur avec cette identité URL n'existe (%{identity_url}) option_separator: ou, please_login: Veuillez vous connecter pour utiliser Tracks session_time_out: La session a expiré. Merci de %{link} session_will_expire: la session expire après %{hours} heure(s) d'inactivité. session_will_not_expire: la session n'expire jamais. sign_in: Se connecter + signup_prompt: Want to create an account? successful: La connexion a réussi. Bienvenue ! successful_with_session_info: 'La connexion a réussi :' unsuccessful: La connexion a échoué. 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 ____ + themes: + black: Black + light_blue: Light blue project: feed_description: Liste de tous les projets de %{username} feed_title: Projets Tracks todo: error_date_must_be_future: doit être une date dans le futur user: - error_context_not_associated: L'identifiant contexte %{context} n'est pas associé - à l'identifiant utilisateur %{user}. + error_context_not_associated: L'identifiant contexte %{context} n'est pas associé à l'identifiant utilisateur %{user}. + error_project_not_associated: Project id %{project} not associated with user id %{user}. notes: - deleted_note: Supprimer la note «?%{id}?» - 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 in_project: 'Dans :' + no_notes_available: 'Il n''y a actuellement aucune note : ajouter des notes aux projets sur les pages individuelles des projets.' note_header: Note %{id} note_link_title: Voir note %{id} note_location_link: 'ln:' - no_notes_available: 'Il n''y a actuellement aucune note : ajouter des notes aux - projets sur les pages individuelles des projets.' + save_status_message: Note %{id} was saved show_note_title: Voir note number: currency: @@ -464,7 +492,17 @@ fr: significant: false strip_insignificant_zeros: false human: + decimal_units: + format: "%n %u" + units: + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион + unit: "." format: + delimiter: Delimiter precision: 1 significant: true strip_insignificant_zeros: true @@ -478,23 +516,29 @@ fr: kb: KB mb: MB tb: TB + percentage: + format: + delimiter: Delimiter + format: "%n%" + precision: + format: + delimiter: Delimiter preferences: authentication_header: Votre authentification change_authentication_type: Modifier votre type d'authentification 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 page_title: TRACKS::Préférences page_title_edit: TRACKS::Éditer les préférences - password_changed: Votre mot de passe a été changé, s'il vous plaît vous connecter - à nouveau. + password_changed: Votre mot de passe a été changé, s'il vous plaît vous connecter à nouveau. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. 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' @@ -502,6 +546,7 @@ fr: authentication: Authentification date_and_time: Date et heure profile: Profil + remove_account: Remove account tracks_behavior: Comportements Tracks title: Vos préférences token_description: Jeton (pour flux et utilisation API) @@ -514,36 +559,42 @@ fr: add_note_submit: Ajouter note add_project: Ajouter projet all_completed_tasks_title: TRACKS::Tous les actions achevées en Projet '%{project_name}' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty completed_projects: Projets réalisés completed_tasks_title: TRACKS::Liste des actions menées à terme dans Projet '%{project_name}' default_context: Le contexte par défaut pour ce projet est %{context} default_context_removed: Contexte par défaut supprimé default_context_set: Définir le contexte par défaut du projet à %{default_context} default_tags_removed_notice: Supprimer les étiquettes par défaut + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty 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 is_active: est actif + last_completed_in_project: "(last %{number})" list_completed_projects: TRACKS::Liste des projets achevés list_projects: TRACKS::Liste des projets list_reviews: TRACKS::Revue - notes: Notes - notes_empty: Il n'y a pas de notes pour ce projet no_default_context: Ce projet n'a pas de contexte par défaut no_last_completed_projects: Pas de projets terminés trouvés no_last_completed_recurring_todos: Non terminé actions répétitives trouvées no_notes_attached: Il n'y a actuellement aucune note attachée à ce projet no_projects: Il n'y a actuellement aucun projet + notes: Notes + notes_empty: Il n'y a pas de notes pour ce projet page_title: 'TRACKS::Projet : %{project}' + project_destroyed_status: Deleted project '%{name}' project_saved_status: Projet sauvegardé project_state: Le projet est %{state} - settings: Paramètres set_default_tags_notice: Définir les étiquettes par défaut du projet à %{default_tags} + settings: Paramètres show_form: Ajouter un projet show_form_title: Créer un nouveau projet state: Le projet est %{state} @@ -553,15 +604,16 @@ fr: was_marked_complete: est complété was_marked_hidden: est caché with_default_context: avec '%{context_name}' comme contexte par défaut + with_default_tags: and with '%{tags}' as the default tags with_no_default_context: sans contexte par défaut with_no_default_tags: et sans étiquettes par défaut search: contexts_matching_query: Contextes correspondant à la requête - notes_matching_query: Notes correspondant à la requête 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 @@ -573,7 +625,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 @@ -590,9 +642,12 @@ fr: active_plural: Actifs blocked: Bloquée blocked_plural: Bloquée + close: Closed + closed_plural: Closed completed: Completé completed_plural: Completés contexts: + ":": ":" active: Contextes actifs closed: Contextes fermés hidden: Contextes cachés @@ -600,6 +655,16 @@ fr: current_plural: Up-to-date hidden: Caché hidden_plural: Cachés + projects: + ":": ":" + active: Active projects + blocked: Blocked + closed: Closed projects + completed: Completed + current: Current + hidden: Hidden projects + review: Review + stalled: Stalled review: Datée review_plural: Datée stalled: Bloqués @@ -607,16 +672,15 @@ fr: visible: Visible visible_plural: Visibles stats: + action_completion_time_title: Temps de réalisation (toutes les actions réalisées) + action_selection_title: TRACKS::Selection action actions: Actions actions_30days_title: Actions des 30 derniers jours - actions_actions_avg_created_30days: Dans les 30 jours vous avez créer en moyenne - %{count} actions + actions_actions_avg_created_30days: Dans les 30 jours vous avez créer en moyenne %{count} actions actions_avg_completed: et réalisé une moyenne de %{count} actions par mois. actions_avg_completed_30days: et réalisé une moyenne de %{count} actions par jour. - actions_avg_completion_time: Pour toutes vos actions réalisés, le temps moyen - de réalisation est %{count} jours. - actions_avg_created: Dans les 12 derniers mois vous avez créé une moyenne de %{count} - actions + actions_avg_completion_time: Pour toutes vos actions réalisés, le temps moyen de réalisation est %{count} jours. + actions_avg_created: Dans les 12 derniers mois vous avez créé une moyenne de %{count} actions actions_day_of_week_legend: day_of_week: Jour de la semaine number_of_actions: Certain nombre d'actions @@ -626,32 +690,28 @@ fr: number_of_actions: Certain nombre d'actions actions_dow_30days_title: Jour de la semaine (les 30 derniers jours) actions_further: et plus - actions_lastyear_title: Actions des 12 derniers mois actions_last_year: Actions des dernières années actions_last_year_legend: months_ago: Mois précédents number_of_actions: Nombre d'actions + actions_lastyear_title: Actions des 12 derniers mois actions_min_completion_time: Le temps minimum de réalisation est %{time}. - actions_min_max_completion_days: Le nombre min/max de jours pour réaliser est - %{min}/%{max}. + actions_min_max_completion_days: Le nombre min/max de jours pour réaliser est %{min}/%{max}. actions_selected_from_week: Actions selectionnées depuis la semaine - action_completion_time_title: Temps de réalisation (toutes les actions réalisées) - action_selection_title: TRACKS::Selection action click_to_return: Cliquer %{link} pour revenir à la page des statistiques click_to_return_link: ici - click_to_show_actions_from_week: Cliquer %{link} pour voir les actions depuis - la semaine %{week}. - click_to_update_actions: Cliquer sur une barre du graphique pour mettre a jour - les actions ci-dessous. + click_to_show_actions_from_week: Cliquer %{link} pour voir les actions depuis la semaine %{week}. + click_to_update_actions: Cliquer sur une barre du graphique pour mettre a jour les actions ci-dessous. contexts: Contextes - current_running_time_of_incomplete_visible_actions: Durée en cours des actions - incomplètes visibles + current_running_time_of_incomplete_visible_actions: Durée en cours des actions incomplètes visibles index_title: TRACKS::Statistiques labels: avg_completed: Moy. Réalisé avg_created: Moy. Créé completed: Complété created: Créé + month_avg_completed: "%{months} Month avg completed" + month_avg_created: "%{months} Month avg created" legend: actions: Actions day_of_week: Jour de la semaine @@ -660,8 +720,7 @@ fr: number_of_days: Il y a ... jours percentage: Pourcentage running_time: Temps en cours d'une action (en semaines) - more_stats_will_appear: Plus de statistiques apparaitront quand vous aurez ajouter - quelques actions. + more_stats_will_appear: Plus de statistiques apparaitront quand vous aurez ajouter quelques actions. no_actions_selected: Il n'y a pas d'actions sélectionnées. no_tags_available: pas d'étiquettes disponibles open_per_week: Actifs (visibles et cachés) prochaines actions par semaine @@ -674,23 +733,18 @@ fr: running_time_all_legend: actions: Actions percentage: Pourcentage - running_time: Temps en cours d'une action (en semaines). Cliquer sur une barre - pour plus d'info + running_time: Temps en cours d'une action (en semaines). Cliquer sur une barre pour plus d'info running_time_legend: actions: Actions percentage: Pourcentage - weeks: Temps en cours d'une action (en semaines). Cliquer sur une barre pour - plus d'info + weeks: Temps en cours d'une action (en semaines). Cliquer sur une barre pour plus d'info spread_of_actions_for_all_context: Vue des actions pour tous les contextes - spread_of_running_actions_for_visible_contexts: Vue des actions en cours pour - tous les contextes - tags: "Étiquettes" - 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_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" + spread_of_running_actions_for_visible_contexts: Vue des actions en cours pour 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_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 time_of_day: Heure (toutes les actions) time_of_day_legend: number_of_actions: Nombre d'actions @@ -703,11 +757,10 @@ fr: top10_projects: Top 10 des projets top10_projects_30days: Top 10 des projets (30 derniers jours) top5_contexts: Top 5 des contextes - top5_visible_contexts_with_incomplete_actions: Top 5 des contextes visibles avec - des actions en cours + top5_visible_contexts_with_incomplete_actions: Top 5 des contextes visibles avec des actions en cours totals: Totaux - totals_actions_completed: dont %{count} sont réalisées. 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_completed_project_count: et %{count} sont des projets réalisés. @@ -744,97 +797,105 @@ fr: 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_marked_complete: L'action '%{description}' a été marquée - comme %{completed} - action_marked_complete_error: L'action '%{description}' n'a PAS - été marquée comme %{completed} a cause d'une erreur sur le serveur + action_marked_complete: L'action '%{description}' a été marquée comme %{completed} + action_marked_complete_error: L'action '%{description}' n'a PAS été marquée comme %{completed} a cause d'une erreur sur le serveur action_saved: Action sauvegardée action_saved_to_tickler: Action sauvegardée dans l'échéancier + actions: + completed: Completed actions + context_completed: Completed actions in this context + context_deferred_pending: Deferred/pending actions in this context + context_without_project: Actions without project in %{param} + home_completed: Completed actions + home_without_project: Actions without project + project_completed: Completed actions in this project + project_deferred_pending: Deferred/pending actions in this project + project_project: Actions in this project + tag_completed: Completed actions tagged with '%{param}' + tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_hidden: Hidden actions tagged with '%{param}' + 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_new_context: Nouveau context ajouté added_new_next_action: Nouvelle action suivante ajoutée added_new_next_action_plural: Nouvelles actions suivantes ajoutées added_new_next_action_singular: Nouvelle action suivante ajoutée added_new_project: Nouveau projet ajouté - add_another_dependency: Ajouter une autre dépendance - add_new_recurring: Ajouter une nouvelle action récurrente all_completed: Toutes les actions réalisées all_completed_here: ici - all_completed_tagged_page_title: TRACKS::Toutes les tâches accomplies par marquer - %{tag_name} + all_completed_tagged_page_title: TRACKS::Toutes les tâches accomplies par marquer %{tag_name} append_in_this_project: dans ce projet 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_after_this_month: Due in %{next_month} and later + 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 - tant que dépendance d'une action complétée ! + cannot_add_dependency_to_completed_todo: Impossible d'ajouter cette action en tant que dépendance d'une action complétée ! clear_due_date: Effacer la date d'échéance clear_show_from_date: Effacer show from date completed: Complété + completed_actions: Completed actions completed_actions_with: Action complétées avec l'étiquette %{tag_name} completed_in_archive: one: Il n'y a pas d'action complétée dans l'archive other: Il y a %{count} actions complétées dans l'archive completed_last_day: Complété ces dernières 24 heures completed_last_x_days: Complété ces %{count} jours - completed_recurrence_completed: Il n'y pas d'action suivante après l'action récurrente - que vous avez supprimée. La récurrence est terminée + completed_recurrence_completed: Il n'y pas d'action suivante après l'action récurrente que vous avez supprimée. La récurrence est terminée completed_recurring: Tâches reccurents complétés + completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Complété dans le reste de ce mois-ci completed_rest_of_previous_month: Complété dans le reste du mois précédent 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}' ?" + completed_today: Completed today + confirm_delete: Êtes-vous sûr de vouloir supprimer l'action '%{description}' ? context_changed: Contexte changé en %{name} convert_to_project: Faire projet - deferred_actions_with: Action reportées avec l'étiquette '%{tag_name}' - deferred_pending_actions: Actions reportées ou en attente - deferred_tasks_title: TRACKS::Échéancier - defer_date_after_due_date: La date de report est après la date d'échéance. Veuillez - ajuster la date d'écheance avant de reporter. + defer_date_after_due_date: La date de report est après la date d'échéance. Veuillez ajuster la date d'écheance avant de reporter. defer_x_days: one: Reporter d'1 jour other: Report de %{count} jours + deferred_actions_with: Action reportées avec l'étiquette '%{tag_name}' + deferred_pending_actions: Actions reportées ou en attente + deferred_tasks_title: TRACKS::Échéancier delete: Supprimer - deleted_success: Action supprimée avec succès. delete_action: Supprimer action + delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'? delete_recurring_action_title: Supprimer l'action récurrente + deleted_success: Action supprimée avec succès. depends_on: Dépend de depends_on_separate_with_commas: Dépend de (séparer avec des virgules) done: Terminé ? - drag_action_title: Déplacer sur une autre action pour la rendre dépendante de - cette action - due: "Échéance" + drag_action_title: Déplacer sur une autre action pour la rendre dépendante de cette action + due: Échéance edit: Modifier edit_action: Modifier action edit_action_with_description: Modifier l'action '%{description}' edit_recurring_todo: Modifier l'action répétant - error_completing_todo: Il s'est produit une erreur lors de l'execution de l'action - récurrente %{description} - error_deleting_item: Il s'est produit une erreur lors de la suppression de l'élément - %{description} - error_deleting_recurring: Il s'est produit une erreur lors de la suppression de - la tâche récurrente '%{description}' - error_removing_dependency: Il s'est produit une erreur lors de la suppression - de la dépendance - error_saving_recurring: Il s'est produit une erreur lors de la sauvegarde de la - tâche récurrente '%{description}' + error: + invalid_due_date: Invalid due date + invalid_show_from_date: Invalid show from date + error_completing_todo: Il s'est produit une erreur lors de l'execution de l'action récurrente %{description} + error_deleting_item: Il s'est produit une erreur lors de la suppression de l'élément %{description} + error_deleting_recurring: Il s'est produit une erreur lors de la suppression de la tâche récurrente '%{description}' + error_removing_dependency: Il s'est produit une erreur lors de la suppression de la dépendance + error_saving_recurring: Il s'est produit une erreur lors de la sauvegarde de la tâche récurrente '%{description}' error_starring: Impossible d'actionner l'étoile de cette tache '%{description}' - error_starring_recurring: Impossible d'actionner l'étoile de la tache récurrente - '%{description}' + error_starring_recurring: Impossible d'actionner l'étoile de la tache récurrente '%{description}' error_toggle_complete: Impossible de marquer cette tache comme complétée - feeds: - completed: 'Complété : %{date}' - due: "Échéance : %{date}" feed_title_in_context: dans le contexte '%{context}' feed_title_in_project: dans le projet '%{project}' + feeds: + completed: 'Complété : %{date}' + due: 'Échéance : %{date}' has_x_pending: one: A une action en attente other: A %{count} actions en attente @@ -842,33 +903,64 @@ fr: in_hidden_state: a l'état caché in_pending_state: en attente list_incomplete_next_actions: Liste les prochaines actions incomplètes - list_incomplete_next_actions_with_limit: Liste les %{count} dernières actions - suivantes incomplètes + list_incomplete_next_actions_with_limit: Liste les %{count} dernières actions suivantes incomplètes + mark_complete: Mark complete 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: 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_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 next_actions_description: 'Filtre :' next_actions_description_additions: 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" - next_action_description: Description de la prochaine action - next_action_needed: Vous devez soumettre au moins une prochaine action + due_today: échéance aujourd'hui + due_within_a_week: échéance dans la semaine + no_actions: + completed: Currently there are no completed actions + completed_recurring: Currently there are no completed recurring todos + completed_rest_of_month: No actions were completed in the rest of this month + completed_rest_of_week: No actions were completed in the rest of this week + completed_today: No actions were completed today + context: Currently there are no incomplete actions in this context + deferred_pending: Currently there are no deferred or pending actions + due_after_this_month: No actions due after this month + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_this_week: No actions due this week + due_today: No actions due today + hidden: Currently there are no hidden actions found + not_done: Currently there are no incomplete actions + not_done_context: Currently there are no incomplete actions in this context + not_done_project: Currently there are no incomplete actions in this project + not_done_with_tag: Currently there are no incomplete actions with the tag '%{param}' + project: Currently there are no incomplete actions in this project + recurring_todos: Currently there are no recurring todos + tag_hidden: Currently there are no hidden actions found + title: No actions found + without_project: Currently there are no actions without a project no_actions_due_this_week: Pas actions à faire cette semaine + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with no_last_completed_actions: Aucune action achevée trouvée no_project: "--Pas de projet--" + no_recurring_todos: No recurring todos + notes: Notes overdue: En retard pending: En attente recurrence: @@ -893,10 +985,12 @@ fr: - Jeudi - Vendredi - Samedi - due: "Échéance" + due: Échéance every_day: chaque jour every_month: chaque mois every_n: tous les %{n} + every_n_days: every %{n} days + every_n_months: every %{n} months every_xth_day_of_every_n_months: tous les %{x} %{day} tous les %{n_months} every_year_on: chaque année le %{date} first: premier @@ -926,26 +1020,31 @@ fr: times: pour %{number} fois until: jusqu'a weekly: Toutes les semaines + recurrence_on: + due_date: set the actions due date + from_tickler: set the date the action should be shown (do not set a due date) + options: Use the calculated date to + show_always: always + show_days_before: not until %{days} days before the due date + show_options: Show the action starts_on: Démarre le weekly: Toutes les semaines weekly_every_number_week: Returns every %{number} week on weekly_options: Paramètres pour les actions récurrentes hebdomadaires yearly: Tous les ans - yearly_every_xth_day: Chaque %{day} %{day_of_week} de %{month} yearly_every_x_day: Chaque %{month} %{day} + yearly_every_xth_day: Chaque %{day} %{day_of_week} de %{month} yearly_options: Paramètres pour les actions récurrentes annuelles - recurrence_completed: Il n'y a pas d'action suivante après l'action récurrente - que vous venez de terminer. Fin de la récurrence + recurrence_completed: Il n'y a pas d'action suivante après l'action récurrente que vous venez de terminer. Fin de la récurrence recurrence_period: Periode de récurrence - recurring_actions_title: TRACKS::Actions récurrentes - recurring_action_deleted: L'action a été supprimée. Parce que cette action est - récurrente, une nouvelle action à été ajoutée + recurring_action_deleted: L'action a été supprimée. Parce que cette action est récurrente, une nouvelle action à été ajoutée recurring_action_saved: Action récurrente sauvée + recurring_actions_title: TRACKS::Actions récurrentes recurring_deleted_success: L'action récurrente a été supprimée avec succès. recurring_pattern_removed: La périodicité est retiré de %{count} recurring_todos: Tâches récurrentes - removed_predecessor: Suppression de %{successor} comme dépendance de %{predecessor} remove_dependency: Enlever les dépendances (l'action n'est pas supprimée) + 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" @@ -954,48 +1053,41 @@ fr: 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." + 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." 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 - pas à une action existante. Cette valeur ne sera pas sauvegardée avec le reste - de l'action. Continuer ? + unresolved_dependency: La valeur saisie dans le champ dépendance ne correspond pas à une action existante. Cette valeur ne sera pas sauvegardée avec le reste de l'action. Continuer ? was_due_on_date: arrivée à échéance le %{date} users: account_signup: Créer un compte + approve_tos: I approve the Terms of Service auth_change_submit: Modifier le type d'authenfication + auth_type_update_error: 'Un problème est survenu lors de la modification du type d''authentification : %{error_messages}' auth_type_updated: Type d'authentification modifié. - auth_type_update_error: 'Un problème est survenu lors de la modification du type - d''authentification : %{error_messages}' - change_authentication_type: Modifier le type d'authentification change_auth_type_title: TRACKS::Modifier le type d'authentification - change_password_prompt: Entrez votre nouveau mot de passe dans les champs ci-dessous - et cliquez sur «?Modifier mot de passe?» pour remplacer votre mot de passe actuel - par le nouveau. + change_authentication_type: Modifier le type d'authentification + change_password_prompt: Entrez votre nouveau mot de passe dans les champs ci-dessous et cliquez sur «?Modifier mot de passe?» pour remplacer votre mot de passe actuel par le nouveau. change_password_submit: Modifier mot de passe change_password_title: TRACKS::Modifier mot de passe choose_password: Choisir le mot de passe confirm_password: Confirmer le mot de passe desired_login: Login souhaité - destroy_confirmation: 'Attention : cela va supprimer l''utilisateur ''%{login}'', - toutes ses actions, contextes, projets et notes. Êtes-vous sûr de vouloir continuer ?' - destroy_error: Une erreur s'est produite lors de la suppression de l'utilisateur - %{login} + destroy_confirmation: 'Attention : cela va supprimer l''utilisateur ''%{login}'', toutes ses actions, contextes, projets et notes. Êtes-vous sûr de vouloir continuer ?' + destroy_error: Une erreur s'est produite lors de la suppression de l'utilisateur %{login} destroy_successful: Utilisateur %{login} supprimé avec succès destroy_user: Supprimer utilisateur + email_address: Email address failed_to_delete_user: La suppression de l'utilisateur %{username} a échoué - first_user_heading: Bienvenue dans TRACKS. Pour commencer, veuillez créer un compte - administrateur + first_user_heading: Bienvenue dans TRACKS. Pour commencer, veuillez créer un compte administrateur + first_user_title: TRACKS::Sign up as the admin user identity_url: URL d'identification label_auth_type: Type d'authentification manage_users: Gérer utilisateurs @@ -1004,20 +1096,17 @@ fr: new_user_heading: 'Créer un nouvel utilisateur :' new_user_title: TRACKS::Créer un administrateur no_signups_title: TRACKS::Pas de signups - openid_ok_pref_failed: Vous avez vérifié avec succès votre identité comme %{url} - mais un problème est survenu lors de la sauvegarde de vos préférences d'authentification. - openid_url_verified: Vous avez vérifié avec succès votre identité comme %{url} - et défini votre type authentification comme OpenID + openid_ok_pref_failed: Vous avez vérifié avec succès votre identité comme %{url} mais un problème est survenu lors de la sauvegarde de vos préférences d'authentification. + openid_url_verified: Vous avez vérifié avec succès votre identité comme %{url} et défini votre type authentification comme OpenID password_confirmation_label: Confirmer mot de passe password_updated: Mot de passe modifié register_with_cas: Avec votre nom d'utilisateur CAS - select_authentication_type: Sélectionner votre nouveau type d'authentification - et cliquer sur 'Modifier type d'authenfication' pour remplacer les paramètres - actuels. + select_authentication_type: Sélectionner votre nouveau type d'authentification et cliquer sur 'Modifier type d'authenfication' pour remplacer les paramètres actuels. signup: Création signup_new_user: Créer un nouvel utilisateur signup_successful: Utilisateur %{username} créé avec succès. successfully_deleted_user: Utilisateur %{username} supprimé avec succès + tos_link: read the Terms of Service total_actions: Total actions total_contexts: Total contextes total_notes: Total notes @@ -1029,8 +1118,7 @@ fr: next_label: Suivant » page_entries_info: multi_page: Affiche %{model} de %{from} - %{to} à %{count} au total - multi_page_html: Affiche %{model} %{from} - %{to} à la %{count} - au total + multi_page_html: Affiche %{model} %{from} - %{to} à la %{count} au total single_page: one: Voir de 1 %{model} other: Afficher tous les %{count} %{model} diff --git a/config/locales/he.yml b/config/locales/he.yml index a68ac37f..b54f3378 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -3,625 +3,740 @@ he: activerecord: attributes: note: - created_at: "נוצר ב" - updated_at: "עודכן ב" + created_at: נוצר ב + updated_at: עודכן ב preference: - date_format: "מבנה תאריך" - due_style: "סגנון תאריך יעד" - first_name: "שם פרטי" - last_name: "שם משפחה" - locale: "שפה" - mobile_todos_per_page: "מספר פעולות לדף (תצוגה ניידת)" - refresh: "תדירות רענון (בדקות)" - review_period: "תדירות רענון פרוייקט" - show_completed_projects_in_sidebar: "הצג פרוייקטים שהסתיימו בצד" - show_hidden_contexts_in_sidebar: "הצג הקשרים מוסתרים בצד" - show_hidden_projects_in_sidebar: "הצג פרוייקטים מוסתרים בצד" - show_number_completed: "הצג מספק פעולות שבוצעו" - show_project_on_todo_done: "עבור לעמוד הפרוייקט בסיום משימה" + date_format: מבנה תאריך + due_style: סגנון תאריך יעד + first_name: שם פרטי + last_name: שם משפחה + locale: שפה + mobile_todos_per_page: מספר פעולות לדף (תצוגה ניידת) + refresh: תדירות רענון (בדקות) + review_period: תדירות רענון פרוייקט + show_completed_projects_in_sidebar: הצג פרוייקטים שהסתיימו בצד + show_hidden_contexts_in_sidebar: הצג הקשרים מוסתרים בצד + show_hidden_projects_in_sidebar: הצג פרוייקטים מוסתרים בצד + show_number_completed: הצג מספק פעולות שבוצעו + show_project_on_todo_done: עבור לעמוד הפרוייקט בסיום משימה sms_context: דוא"ל ברירת מחדר עבור הקשר - sms_email: "דואר מאת" - staleness_starts: "התחלת תפלות" - time_zone: "אזור זמן" - title_date_format: "מבנה תאריך כותרת" - verbose_action_descriptors: "תיאורי משימות מפורטים" - week_starts: "שבוע מתחיל ביום" + sms_email: דואר מאת + staleness_starts: התחלת תפלות + time_zone: אזור זמן + title_date_format: מבנה תאריך כותרת + verbose_action_descriptors: תיאורי משימות מפורטים + week_starts: שבוע מתחיל ביום project: - default_context_name: "הקשר ברירת מחדל" - default_tags: "תגיות ברירת מחדל" - description: "תיאור" - name: "שם" + default_context_name: הקשר ברירת מחדל + default_tags: תגיות ברירת מחדל + description: תיאור + name: שם todo: - context: "הקשר" - description: "תיאור" - due: "תאריך יעד" - notes: "פתקיות" - predecessors: "תלוי ב" - project: "פרוייקטים" - show_from: "הצג מ" - tags: "תגיות" + context: הקשר + description: תיאור + due: תאריך יעד + notes: פתקיות + predecessors: תלוי ב + project: פרוייקטים + show_from: הצג מ + tags: תגיות user: - first_name: "שם פרטי" - last_name: "שם משפחה" + auth_type: Auth type + display_name: Display name + email: Email address + first_name: שם פרטי + last_name: שם משפחה + login: Login + open_id_url: OpenID URL + password: Password errors: full_messages: format: "%{attribute} %{message}" messages: - accepted: "חייב להתקבל" - blank: "לא יכול להיות ריק" - confirmation: "אינו תואם את האישור" - empty: "לא יכול להיות ריק" - equal_to: "חייב להיות שווה ל %{count}" - even: "חייב להיות זוגי" - exclusion: "שמור" - greater_than: "חייב להיות גדול מ %{count}" - greater_than_or_equal_to: "חייב להיות גודל או שווה ל %{count}" - inclusion: "לא מוכל ברשימה" - invalid: "לא יכול להכיל את תו (',') הפסיק" - less_than_or_equal_to: "חייב להיות קטן או שווה ל %{count}" - not_a_number: "אינו מספר" - odd: "חייב להיות אי זוגי" - record_invalid: "אימות נכשל %{errors}" - taken: "כבר נמצא בשימוש" - too_long: "ארוך מדי (לכל היותר %{count} תווים(" - too_short: "קצר צדי (לכל הפחות %{count} תווים(" - wrong_length: "באורך לא נכון (צריך להיות %{count} תווים(" + accepted: חייב להתקבל + blank: לא יכול להיות ריק + confirmation: אינו תואם את האישור + empty: לא יכול להיות ריק + equal_to: חייב להיות שווה ל %{count} + even: חייב להיות זוגי + exclusion: שמור + greater_than: חייב להיות גדול מ %{count} + greater_than_or_equal_to: חייב להיות גודל או שווה ל %{count} + inclusion: לא מוכל ברשימה + invalid: לא יכול להכיל את תו (',') הפסיק + less_than: must be less than %{count} + less_than_or_equal_to: חייב להיות קטן או שווה ל %{count} + not_a_number: אינו מספר + odd: חייב להיות אי זוגי + record_invalid: אימות נכשל %{errors} + restrict_dependent_destroy: + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее + taken: כבר נמצא בשימוש + too_long: ארוך מדי (לכל היותר %{count} תווים( + too_short: קצר צדי (לכל הפחות %{count} תווים( + wrong_length: באורך לא נכון (צריך להיות %{count} תווים( models: project: attributes: name: - blank: "לפרוייקט חייב להיות שם" - taken: "כבר קיים" - too_long: "על שם הפרוייקט להכיל פחות מ-256 תווים" + blank: לפרוייקט חייב להיות שם + taken: כבר קיים + too_long: על שם הפרוייקט להכיל פחות מ-256 תווים template: - body: "בעיות בשדות הבאים:" + body: 'בעיות בשדות הבאים:' + header: + one: 1 error prohibited this %{model} from being saved + other: "%{count} errors prohibited this %{model} from being saved" common: - action: "פעולה" - actions: "פעולות" + action: פעולה + actions: פעולות actions_midsentence: - one: "פעולה" - other: "פעולות" - zero: "פעולות" - add: "הוסף" - ajaxError: "שגיאה בתגובה מהשרת" - back: "אחורה" - bugs: "באגים" - cancel: "בטל" - context: "הקשר" - contexts: "הקשרים" - contribute: "תרום" - create: "צור" + one: פעולה + other: פעולות + zero: פעולות + add: הוסף + ajaxError: שגיאה בתגובה מהשרת + back: אחורה + bugs: באגים + cancel: בטל + collapse_expand: Collapse/expand + context: הקשר + contexts: הקשרים + contribute: תרום + create: צור days_midsentence: - one: "יום" - other: "ימים" - zero: "ימים" - deferred: "נדחה" - description: "תיאור" - drag_handle: "משוך" + one: יום + other: ימים + zero: ימים + deferred: נדחה + description: תיאור + drag_handle: משוך email: דוא"ל - errors_with_fields: "שגירות בשדות המצויינים" - first: "ראשון" - forth: "ואילך" - fourth: "רביעי" - go_back: "חזור" - last: "אחרון" - logout: "צא" - month: "חודש" - months: "חודשים" - next: "הבא" - none: "הערה" + errors_with_fields: שגירות בשדות המצויינים + first: ראשון + forth: ואילך + fourth: רביעי + go_back: חזור + last: אחרון + logout: צא + mailing_list: Mailing List + month: חודש + months: חודשים + next: הבא + none: הערה + not_available_abbr: ל/י note: - one: "פתקה" + one: פתקה other: "%{count} פתקיות" - zero: "אין פתקיות" - notes: "פתקיות" - not_available_abbr: "ל/י" - numbered_step: "צעד %{number}" - ok: "אוקי" - optional: "אפשרי" - previous: "הקודם" - project: "פרוייקט" - projects: "פרוייקטים" - recurring_todos: "פעולות מחזוריות" - review: "ביקורת" - search: "חיפוש" - second: "שני" - server_error: "התרחשה שגיאת שרת" - show_all: "הצג הכל" + zero: אין פתקיות + notes: פתקיות + numbered_step: צעד %{number} + ok: אוקי + optional: אפשרי + previous: הקודם + project: פרוייקט + projects: פרוייקטים + recurring_todos: פעולות מחזוריות + review: ביקורת + search: חיפוש + second: שני + server_error: התרחשה שגיאת שרת + show_all: הצג הכל sort: - alphabetically: "אלפבתי" - alphabetically_confirm: "לסדר את הפרוייקטים בסדר אלפבתי? הפעולה תחליף את הסדר - הקיים" - alphabetically_title: "סדר פרוייקטים אלפבטית" - by_task_count: "לפי מספר משימות" - by_task_count_title: "מיין לפי מספר משימות" - by_task_count_title_confirm: "לסדר את הפרוייקטים לפי מספר המשימות? הפעולה תחליף - את הסדר הקיים" - sort: "מיין" - third: "שלישי" - todo: "משימה" - update: "עדכן" - website: "אתר" - week: "שבוע" - weeks: "שבועות" - wiki: "ויקי" + alphabetically: אלפבתי + alphabetically_confirm: לסדר את הפרוייקטים בסדר אלפבתי? הפעולה תחליף את הסדר הקיים + alphabetically_title: סדר פרוייקטים אלפבטית + by_task_count: לפי מספר משימות + by_task_count_title: מיין לפי מספר משימות + by_task_count_title_confirm: לסדר את הפרוייקטים לפי מספר המשימות? הפעולה תחליף את הסדר הקיים + sort: מיין + third: שלישי + todo: משימה + update: עדכן + website: אתר + week: שבוע + weeks: שבועות + wiki: ויקי contexts: - add_context: "הוספת הקשר" - all_completed_tasks_title: "מסלולים::כל הפעולות שבוצעו במלואן בהקשר '%{context_name}'" - completed_tasks_title: "מסלולים::פעולות שבוצעו במלואן בהקשר '%{context_name}'" - context_deleted: "נמחק הקשר '%{name}'" - context_hide: "הסתרה מעמוד הבית?" - context_name: "שם הקשר" - delete_context: "מחק הקשר" - delete_context_confirmation: "האם למחוק את ההקשר '%{name}'? יש להזהר מפני שפעולה - זו מתחוק את כל הפעולות המחזוריות בהקשר זה" - delete_context_title: "מחיקת הקשר" - edit_context: "עריכת הקשר" - hidden_contexts: "הקשרים מוסתרים" - hide_form: "הסתרת טופס" - hide_form_title: "הסתרת טופס הקשר חדש" - last_completed_in_context: "בהקשר זה (אחרונות %{number})" + add_context: הוספת הקשר + all_completed_tasks_title: מסלולים::כל הפעולות שבוצעו במלואן בהקשר '%{context_name}' + completed_tasks_title: מסלולים::פעולות שבוצעו במלואן בהקשר '%{context_name}' + context_deleted: נמחק הקשר '%{name}' + context_hide: הסתרה מעמוד הבית? + context_name: שם הקשר + context_state: Context state + delete_context: מחק הקשר + delete_context_confirmation: האם למחוק את ההקשר '%{name}'? יש להזהר מפני שפעולה זו מתחוק את כל הפעולות המחזוריות בהקשר זה + delete_context_title: מחיקת הקשר + edit_context: עריכת הקשר + hidden_contexts: הקשרים מוסתרים + hide_form: הסתרת טופס + hide_form_title: הסתרת טופס הקשר חדש + last_completed_in_context: בהקשר זה (אחרונות %{number}) new_context_post: "' יווצרו בנוסף. האם להמשיך?" - new_context_pre: "הקשר חדש '" - no_contexts_active: "אין כרגע הקשרים פעילים" - no_contexts_hidden: "אין כרגע הקשרים מוסתרים" - save_status_message: "הקשר נשמר" - show_form: "יצירת הקשר חדש" - show_form_title: "הוספת הקשר" - status_active: "ההקשר פעיל" - status_hidden: "ההקשר מוסתר" - todos_append: "בהקשר זה" - update_status_message: "שונה שם ההקשר" - visible_contexts: "הקשרים גלויים" + new_context_pre: הקשר חדש ' + no_contexts_: 'No contexts ' + no_contexts_active: אין כרגע הקשרים פעילים + no_contexts_closed: Currently there are no closed contexts + no_contexts_hidden: אין כרגע הקשרים מוסתרים + save_status_message: הקשר נשמר + show_form: יצירת הקשר חדש + show_form_title: הוספת הקשר + status_active: ההקשר פעיל + status_hidden: ההקשר מוסתר + todos_append: בהקשר זה + update_status_message: שונה שם ההקשר + visible_contexts: הקשרים גלויים data: - import_errors: "שגיאות ביבוא" - import_successful: "יבוא בוצע בהצלחה" + import_destination_invalid: Invalid import destination + import_errors: שגיאות ביבוא + import_successful: יבוא בוצע בהצלחה + invalid_import_destination: Invalid import destination date: + abbr_day_names: '["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]' + abbr_month_names: '[nil, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]' + day_names: '["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]' formats: default: "%Y-%m-%d" long: "%B %d, %Y" longer: "%A %B %d, %Y" + month_day: Month day + only_day: Only day short: "%b %d" + month_names: '[nil, "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]' + order: "[:year, :month, :day]" datetime: distance_in_words: about_x_hours: - one: "כשעה" - other: "כ-%{count} שעות" + one: כשעה + other: כ-%{count} שעות about_x_months: - one: "כחודש" - other: "כ-%{count} חודשים" + one: כחודש + other: כ-%{count} חודשים about_x_years: - one: "כשנה" - other: "כ-%{count} שנים" + one: כשנה + other: כ-%{count} שנים almost_x_years: - one: "כמעט שנה" - other: "כמעט %{count} שנים" - half_a_minute: "חצי דקה" + one: כמעט שנה + other: כמעט %{count} שנים + half_a_minute: חצי דקה less_than_x_minutes: - one: "פחות מדקה" - other: "פחות מ-%{count} דקות" - zero: "פחות מדקה" + one: פחות מדקה + other: פחות מ-%{count} דקות + zero: פחות מדקה less_than_x_seconds: - one: "פחות משנייה" - other: "פחות מ-%{count} שניות" - zero: "פחות משנייה" + one: פחות משנייה + other: פחות מ-%{count} שניות + zero: פחות משנייה over_x_years: - one: "מעלה לשנה" - other: "מעל %{count} שנים" + one: מעלה לשנה + other: מעל %{count} שנים x_days: - one: "יום" + one: יום other: "%{count} ימים" x_minutes: - one: "דקה" + one: דקה other: "%{count} דקות" x_months: - one: "חודש" + one: חודש other: "%{count} חודשים" x_seconds: - one: "שנייה" + one: שנייה other: "%{count} שניות" prompts: - day: "יום" - hour: "שעה" - minute: "דקה" - month: "חודש" - second: "שניות" - year: "שנה" + day: יום + hour: שעה + minute: דקה + month: חודש + second: שניות + year: שנה errors: + format: "%{attribute} %{message}" + messages: + accepted: должен быть подтвержден + blank: должна быть заполнена + confirmation: не соответствует %{attribute} + empty: не может быть пустым + equal_to: должно равняться %{count} + even: должно быть четным + exclusion: зарезервированно + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше или равно %{count} + inclusion: не входит в список + invalid: неверное + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + not_an_integer: должно быть целым числом + odd: должно быть нечетным + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято + too_long: 'слишком длинное (максимум: %{count} символов)' + too_short: 'слишком кроткое (минимум: %{count} символов)' + wrong_length: неверной длины (должно быть %{count} символов) user_unauthorized: '401 לא מאושר: רק משתמשים בדרגת מנהל רשאים להפעיל פעולה זו' feedlist: - actions_completed_last_week: "פעולות שהסתיימו בשבעת הימים האחרונים" - actions_due_next_week: "פעולות שיש לבצע בשבעת הימים הקרובים" - actions_due_today: "פעולות לביצוע היום או מוקדם יותר" - active_projects_wo_next: "פרוייקטים פעילים ללא פעולות המשך" - active_starred_actions: "כל הפעולות הפעילות והמדגשות" - all_actions: "כל הפעולות" - all_contexts: "כל ההקשרים" - all_projects: "כל הפרוייקטים" - choose_context: "בחירת ההקשר עבורו דרושה הזנה" - choose_project: "בחירת הפרוייקט עבורו דרושה הזנה" - context_centric_actions: "הזנות עבור פעולות שלא נסתיימו בהקשר נתון" - context_needed: "צריך להיות לפחות הקשר אחד לפני שניתן לבקשר הזנה" - ical_feed: "הזנת iCal" + actions_completed_last_week: פעולות שהסתיימו בשבעת הימים האחרונים + actions_due_next_week: פעולות שיש לבצע בשבעת הימים הקרובים + actions_due_today: פעולות לביצוע היום או מוקדם יותר + active_projects_wo_next: פרוייקטים פעילים ללא פעולות המשך + active_starred_actions: כל הפעולות הפעילות והמדגשות + all_actions: כל הפעולות + all_contexts: כל ההקשרים + all_projects: כל הפרוייקטים + choose_context: בחירת ההקשר עבורו דרושה הזנה + choose_project: בחירת הפרוייקט עבורו דרושה הזנה + context_centric_actions: הזנות עבור פעולות שלא נסתיימו בהקשר נתון + context_needed: צריך להיות לפחות הקשר אחד לפני שניתן לבקשר הזנה + ical_feed: הזנת iCal last_fixed_number: "%{number} פעולות אחרונות" - legend: "מקרא:" - notice_incomplete_only: "הערה: כל ההזנות מציגות את כל הפעולות שלא סומנו כמבוצעות - אלא אם כן נבחר במפורש אחרת." - plain_text_feed: "הזנת טקסט פשוט" - projects_and_actions: "פרוויקטים פעילים והפעולות שלהם" - project_centric: "הזנות עבור פעולות שלא הסתיימו בפרוייקט מסויים" - project_needed: "דרוש לפחות פרוייקט אחד לפני שניתן לבקש הזנה" - rss_feed: "הזנת רסס" - select_feed_for_context: "בחירת ההזנה עבור ההקשר הנתון" - select_feed_for_project: "בחירת ההזנה עבור הפרוייקט" + legend: 'מקרא:' + notice_incomplete_only: 'הערה: כל ההזנות מציגות את כל הפעולות שלא סומנו כמבוצעות אלא אם כן נבחר במפורש אחרת.' + plain_text_feed: הזנת טקסט פשוט + project_centric: הזנות עבור פעולות שלא הסתיימו בפרוייקט מסויים + project_needed: דרוש לפחות פרוייקט אחד לפני שניתן לבקש הזנה + projects_and_actions: פרוויקטים פעילים והפעולות שלהם + rss_feed: הזנת רסס + select_feed_for_context: בחירת ההזנה עבור ההקשר הנתון + select_feed_for_project: בחירת ההזנה עבור הפרוייקט footer: - send_feedback: "שליחת משוב על גירסא %{version}" + send_feedback: שליחת משוב על גירסא %{version} + helpers: + select: + prompt: Выберите + submit: + create: Создать %{model} + submit: Сохранить %{model} + update: Обновить %{model} integrations: - opensearch_description: "חיפוש במסלולים" + opensearch_description: חיפוש במסלולים layouts: mobile_navigation: + calendar: Calendar contexts: 2-הקשרים - feeds: "הזנות" + feeds: הזנות + full: Full Site home: 1-בית - logout: "צא" + logout: צא new_action: 0-פעולה חדשה - projects: "פרוייקטים" + projects: פרוייקטים starred: 4-מודגשים - tickler: "מִזְכָּר" + tickler: מִזְכָּר navigation: - admin: "ניהול" - api_docs: "תיעוד ממשק תכנות" - calendar: "לוח שנה" - calendar_title: "לוח שנה של משימות לביצוע" - completed_tasks: "בוצע" - completed_tasks_title: "הסתיים" - contexts_title: "הקשרים" - export: "יצוא" - export_title: "יבוא ויצוא נתונים" - feeds: "הזנות" - feeds_title: "צפיה ברשימת ההזנות הזמינה" + admin: ניהול + api_docs: תיעוד ממשק תכנות + calendar: לוח שנה + calendar_title: לוח שנה של משימות לביצוע + completed_tasks: בוצע + completed_tasks_title: הסתיים + contexts_title: הקשרים + export: יצוא + export_title: יבוא ויצוא נתונים + feeds: הזנות + feeds_title: צפיה ברשימת ההזנות הזמינה + group_view_by_context: Group by context + group_view_by_project: Group by project + group_view_by_title: Change the grouping of the actions on this page help: "?" - home: "בית" - home_title: "בית" - integrations_: "שילוב מסלולים" - manage_users: "ניהול משתמשים" - manage_users_title: "הוספה או הסרה של משתמשים" - notes_title: "הצגת כל הפתקיות" - organize: "ארגון" - preferences: "העדפות" - preferences_title: "הצגת העדפותי" - projects_title: "פרוייקטים" - recurring_todos: "משימות מחזוריות" - recurring_todos_title: "ניהול פעולות מחזוריות" - review_title: "עריכצ ביקורת" - search: "חיפוש כל הפריטים" - starred: "מודגשים" - starred_title: "הצגת פעולות מודגשות" - stats: "סטטיסטיקה" - stats_title: "הצגת הסטטיסטיקה שלי" - tickler: "מִזְכָּר" - tickler_title: "מִזְכָּר" - view: "תצוגה" - next_actions_rss_feed: "הזנת רסס לפעולות המשך" - toggle_contexts: "הצגת שדות מוסתרים" - toggle_contexts_title: "הסתרת/הצגת שדות מוסתרים" - toggle_notes: "חשיפת פתקיות" - toggle_notes_title: "חשיפת כל הפתקיות" + help_page: Help + home: בית + home_title: בית + import: Import + import_title: Import data + integrations_: שילוב מסלולים + manage_users: ניהול משתמשים + manage_users_title: הוספה או הסרה של משתמשים + mobile: Mobile Site + notes_title: הצגת כל הפתקיות + options: Options + organize: ארגון + preferences: העדפות + preferences_title: הצגת העדפותי + projects_title: פרוייקטים + recurring_todos: משימות מחזוריות + recurring_todos_title: ניהול פעולות מחזוריות + review_title: עריכצ ביקורת + search: חיפוש כל הפריטים + show_empty_containers_context: Show empty contexts + show_empty_containers_project: Show empty projects + show_empty_containers_title: Show or hide the empty projects or contexts + starred: מודגשים + starred_title: הצגת פעולות מודגשות + stats: סטטיסטיקה + stats_title: הצגת הסטטיסטיקה שלי + tickler: מִזְכָּר + tickler_title: מִזְכָּר + view: תצוגה + next_actions_rss_feed: הזנת רסס לפעולות המשך + toggle_contexts: הצגת שדות מוסתרים + toggle_contexts_title: הסתרת/הצגת שדות מוסתרים + toggle_notes: חשיפת פתקיות + toggle_notes_title: חשיפת כל הפתקיות login: - account_login: "כניסה לחשבון" - cas_create_account: "אם ברצונך לבקש יש להמשיך ל-%{signup_link}" - cas_logged_in_greeting: "שלום %{username}! הזיהוי הצליח" + account_login: כניסה לחשבון + cas_create_account: אם ברצונך לבקש יש להמשיך ל-%{signup_link} + cas_logged_in_greeting: שלום %{username}! הזיהוי הצליח cas_login: התחברות שא"מ (שירות אימות מרכזי) cas_no_user_found: "%{username} שלום! אין חשבון בשם זה במסלולים." - cas_signup_link: "בקשת משתמש" + cas_signup_link: בקשת משתמש cas_username_not_found: לצערנו, לא קיים משתמש שא"מ בשם (%{username}) - logged_out: "בוצעה יציאה מ-מסלולים" + log_in_again: כניסה מחודשת + logged_out: בוצעה יציאה מ-מסלולים login_cas: הגעה אל שא"מ - login_standard: "חזרה לכניסה הרגילה" - login_with_openid: "כניסה על OpenID" - log_in_again: "כניסה מחודשת" + login_standard: חזרה לכניסה הרגילה + login_with_openid: כניסה על OpenID mobile_use_openid: "...או כניסה עם OpenID" - openid_identity_url_not_found: "לצערנו, לא קיים משתמש עם כתובת זהות (%{identity_url})" - option_separator: "או," - please_login: "יש להכנס כדי להשתמש ב-מסלולים" - session_time_out: "פג תוקף הגישה. נא %{link}" - session_will_expire: "תוקף הגישה יפוג לאחר %{hours} שעה(ות) של חוסר פעילות." - session_will_not_expire: "הגישה ללא תפוגה." - sign_in: "כניסה" - successful: "כניסה בוצעה בהצלחה. ברוך שובך!" - successful_with_session_info: "כניסה מוצלחת:" - unsuccessful: "כניסה נכשלה." - user_no_expiry: "השארת חיבור" + openid_identity_url_not_found: לצערנו, לא קיים משתמש עם כתובת זהות (%{identity_url}) + option_separator: או, + please_login: יש להכנס כדי להשתמש ב-מסלולים + session_time_out: פג תוקף הגישה. נא %{link} + session_will_expire: תוקף הגישה יפוג לאחר %{hours} שעה(ות) של חוסר פעילות. + session_will_not_expire: הגישה ללא תפוגה. + sign_in: כניסה + signup_prompt: Want to create an account? + successful: כניסה בוצעה בהצלחה. ברוך שובך! + successful_with_session_info: 'כניסה מוצלחת:' + unsuccessful: כניסה נכשלה. + user_no_expiry: השארת חיבור models: preference: - due_in: "תאריך יעד בעוד %{days} ימים" + due_in: תאריך יעד בעוד %{days} ימים due_on: "- יעד ב%{date}" + due_styles: '["Due in ___ days", "Due on _______"]' + themes: + black: Black + light_blue: Light blue project: - feed_description: "רשימת כל הפרוייקטים עבור %{username}" - feed_title: "פרוייקטים במסלולים" + feed_description: רשימת כל הפרוייקטים עבור %{username} + feed_title: פרוייקטים במסלולים todo: - error_date_must_be_future: "חייב להיות תאריך עתידי" + error_date_must_be_future: חייב להיות תאריך עתידי user: - error_context_not_associated: "מזהה הקשר %{context} אינו משוייך עם מזה משתמש - %{user}." - error_project_not_associated: "מזהה פרוייקט %{project} אינו משוייך עם מזה משתמש - %{user}." + error_context_not_associated: מזהה הקשר %{context} אינו משוייך עם מזה משתמש %{user}. + error_project_not_associated: מזהה פרוייקט %{project} אינו משוייך עם מזה משתמש %{user}. notes: - deleted_note: "הפתקית '%{id}' נמחקה" - delete_confirmation: "האם למחוק את הפתקית '%{id}'?" - delete_item_title: "מחיקת פריט" - delete_note_confirm: "האם למחוק את הפתקית '%{id}'?" - delete_note_title: "מחיקת הפתקית '%{id}'" - edit_item_title: "עריכת פריט" - in_project: "ב:" - note_header: "פתקית %{id}" - note_link_title: "הצגת פתקית %{id}" - note_location_link: "בתוך:" - no_notes_available: "אין כרגע פתקיות: ניתן להוסיף פתקיות לפְּרוֹיֶקְטים ספציפיים - מעמוד הפְּרוֹיֶקְט" - show_note_title: "הצגת פתקית" + delete_confirmation: האם למחוק את הפתקית '%{id}'? + delete_item_title: מחיקת פריט + delete_note_confirm: האם למחוק את הפתקית '%{id}'? + delete_note_title: מחיקת הפתקית '%{id}' + deleted_note: הפתקית '%{id}' נמחקה + edit_item_title: עריכת פריט + in_project: 'ב:' + no_notes_available: 'אין כרגע פתקיות: ניתן להוסיף פתקיות לפְּרוֹיֶקְטים ספציפיים מעמוד הפְּרוֹיֶקְט' + note_header: פתקית %{id} + note_link_title: הצגת פתקית %{id} + note_location_link: 'בתוך:' + save_status_message: Note %{id} was saved + show_note_title: הצגת פתקית number: currency: format: delimiter: "," format: "%u%n" + precision: '2' separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros unit: "₪" format: delimiter: "," + precision: '3' separator: "." + significant: Significant + strip_insignificant_zeros: Strip insignificant zeros human: + decimal_units: + format: "%n %u" + units: + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион + unit: "." + format: + delimiter: Delimiter + precision: '1' + significant: 'true' + strip_insignificant_zeros: 'true' storage_units: format: "%u%n" units: byte: - one: "בייט" - other: "בתים" - gb: "ג'יגהבייט" - kb: "קילו בייט" - mb: "מגה בייט" - tb: "טרה בייט" + one: בייט + other: בתים + gb: ג'יגהבייט + kb: קילו בייט + mb: מגה בייט + tb: טרה בייט + percentage: + format: + delimiter: Delimiter + format: "%n%" + precision: + format: + delimiter: Delimiter preferences: - authentication_header: "הזיהוי שלי" - change_authentication_type: "שינוי סוג הזדהות" - change_identity_url: "שינוי כתובת URL הזדהות" - change_password: "סינוי סיסמא" - current_authentication_type: "שיטת הזיהוי שלי היא %{auth_type}" - edit_preferences: "עריכת העדפות" - generate_new_token: "יצירת אסימון חדש" - generate_new_token_confirm: "בטוח? יצירת אסימון חדש תחליף את האסימון הקיים ותבטל - את השימוש בו." - is_false: "שלילי" - is_true: "חיובי" - open_id_url: "כתובת זיהוי OpenID שלך היא" - page_title: "מסלולים::העדפות" - page_title_edit: "מסלולים::עריכת העדפות" - password_changed: "הסיסמא שונתה, יש להיכנס שנית." - show_number_completed: "הצג %{number} פריטים שהסתיימו" - sms_context_none: "ללא" - staleness_starts_after: "תפלות מתחילה לאחר %{days} ימים" + authentication_header: הזיהוי שלי + change_authentication_type: שינוי סוג הזדהות + change_identity_url: שינוי כתובת URL הזדהות + change_password: סינוי סיסמא + current_authentication_type: שיטת הזיהוי שלי היא %{auth_type} + edit_preferences: עריכת העדפות + generate_new_token: יצירת אסימון חדש + generate_new_token_confirm: בטוח? יצירת אסימון חדש תחליף את האסימון הקיים ותבטל את השימוש בו. + is_false: שלילי + is_true: חיובי + open_id_url: כתובת זיהוי OpenID שלך היא + page_title: מסלולים::העדפות + page_title_edit: מסלולים::עריכת העדפות + password_changed: הסיסמא שונתה, יש להיכנס שנית. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + show_number_completed: הצג %{number} פריטים שהסתיימו + sms_context_none: ללא + staleness_starts_after: תפלות מתחילה לאחר %{days} ימים tabs: - authentication: "אימות" - date_and_time: "תאריך ושעה" - profile: "פרופיל" - tracks_behavior: "התנהגות מסלולים" - title: "ההגדרות שלי" - token_description: "אסימון (משמש להזנות ישימוש ממשק תכתנות)" - token_header: "האסימון שלי" - updated: "העדפות עודכנו" + authentication: אימות + date_and_time: תאריך ושעה + profile: פרופיל + remove_account: Remove account + tracks_behavior: התנהגות מסלולים + title: ההגדרות שלי + token_description: אסימון (משמש להזנות ישימוש ממשק תכתנות) + token_header: האסימון שלי + updated: העדפות עודכנו projects: - actions_in_project_title: "פעולות בפרוייקט זה" - active_projects: "פרוייקטים פעילים" - add_note: "הוספת פתק" - add_note_submit: "הוספת פתק" - add_project: "הוספת פרוייקט" - all_completed_tasks_title: "מסלולים::הצגת רשימת כל המשימות שהושלמו בפרוייקט '%{project_name}'" - completed_projects: "פרוייקטים שהסתיימו" - completed_tasks_title: "מסלולים::הצגת רשימת המשימות שהושלמו בפרוייקט '%{project_name}'" - default_context: "הקשר ברירת המחדש לפרוייקט זה %{context}" - default_context_removed: "הקשר ברירת המחדל הוסר" - default_context_set: "בחירת הקשר ברירת המחדל לפרוייקט ל-%{default_context}" - default_tags_removed_notice: "תגיות ברירת המחדל הוסרו" - delete_project: "מחיקת פרוייקט" - delete_project_confirmation: "האם למחוק את הפרוייקט '%{name}'?" - delete_project_title: "מחיקת הפרוייקט" - edit_project_settings: "עריכת הגדרות פרוייקט" - edit_project_title: "עריכת פרוייקט" - hidden_projects: "פרוייקטים שהוסתרו" - hide_form: "הסתרת טופס" - hide_form_title: "הסתרת טופס פרוייקט חדש" - is_active: "פעיל" - list_completed_projects: "מסלולים::רשימת הפרוייקטים שהולשמו" - list_projects: "מסלולים::רשימת פרוייקטים" - list_reviews: "מסלולים::סקירה" - notes: "פתקיות" - notes_empty: "אין פתקיות לפרוייקט זה" - no_default_context: "אין הקשר ברירת מחדל לפרוייקט זה" - no_last_completed_projects: "לא נמצאו פרוייקטים שהסתיימו" - no_last_completed_recurring_todos: "לא נמצאו משימות מחזוריות שהסתיימו" - no_notes_attached: "אין כרגע פתקיות המקושרות לפרוייקט זה" - no_projects: "אין כרגע פרוייקטים" - page_title: "מסלולים::פרוייקט: %{project}" - project_saved_status: "פרוייקט נשמר" - project_state: "הפרוייקט %{state}" - settings: "הגדרות" - set_default_tags_notice: "בחירת תגיות ברירת המחדל ל-%{default_tags}" - show_form: "הוספת פרוייקט" - show_form_title: "יצירת פרוייקט חדש" - state: "הפרוייקט במצב %{state}" - status_project_name_changed: "שם הפרוייקט שונה" - this_project: "פרוייקט זה" - to_new_project_page: "עבור לעמוד הפרוייקט החדש" - was_marked_complete: "סומן כבוצע" - was_marked_hidden: "סומן כמוסתר" - with_default_context: "עם הקשר בירת מחדל '%{context_name}'" - with_default_tags: "עם התגיות '%{tags}' כברירת המחדל" - with_no_default_context: "ללא הקשר ברירת מחדל" - with_no_default_tags: "וללא תגיות ברירת מחדל" + actions_in_project_title: פעולות בפרוייקט זה + active_projects: פרוייקטים פעילים + add_note: הוספת פתק + add_note_submit: הוספת פתק + add_project: הוספת פרוייקט + all_completed_tasks_title: מסלולים::הצגת רשימת כל המשימות שהושלמו בפרוייקט '%{project_name}' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty + completed_projects: פרוייקטים שהסתיימו + completed_tasks_title: מסלולים::הצגת רשימת המשימות שהושלמו בפרוייקט '%{project_name}' + default_context: הקשר ברירת המחדש לפרוייקט זה %{context} + default_context_removed: הקשר ברירת המחדל הוסר + default_context_set: בחירת הקשר ברירת המחדל לפרוייקט ל-%{default_context} + default_tags_removed_notice: תגיות ברירת המחדל הוסרו + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty + delete_project: מחיקת פרוייקט + delete_project_confirmation: האם למחוק את הפרוייקט '%{name}'? + delete_project_title: מחיקת הפרוייקט + edit_project_settings: עריכת הגדרות פרוייקט + edit_project_title: עריכת פרוייקט + hidden_projects: פרוייקטים שהוסתרו + hide_form: הסתרת טופס + hide_form_title: הסתרת טופס פרוייקט חדש + is_active: פעיל + last_completed_in_project: "(last %{number})" + list_completed_projects: מסלולים::רשימת הפרוייקטים שהולשמו + list_projects: מסלולים::רשימת פרוייקטים + list_reviews: מסלולים::סקירה + no_default_context: אין הקשר ברירת מחדל לפרוייקט זה + no_last_completed_projects: לא נמצאו פרוייקטים שהסתיימו + no_last_completed_recurring_todos: לא נמצאו משימות מחזוריות שהסתיימו + no_notes_attached: אין כרגע פתקיות המקושרות לפרוייקט זה + no_projects: אין כרגע פרוייקטים + notes: פתקיות + notes_empty: אין פתקיות לפרוייקט זה + page_title: 'מסלולים::פרוייקט: %{project}' + project_destroyed_status: Deleted project '%{name}' + project_saved_status: פרוייקט נשמר + project_state: הפרוייקט %{state} + set_default_tags_notice: בחירת תגיות ברירת המחדל ל-%{default_tags} + settings: הגדרות + show_form: הוספת פרוייקט + show_form_title: יצירת פרוייקט חדש + state: הפרוייקט במצב %{state} + status_project_name_changed: שם הפרוייקט שונה + this_project: פרוייקט זה + to_new_project_page: עבור לעמוד הפרוייקט החדש + was_marked_complete: סומן כבוצע + was_marked_hidden: סומן כמוסתר + with_default_context: עם הקשר בירת מחדל '%{context_name}' + with_default_tags: עם התגיות '%{tags}' כברירת המחדל + with_no_default_context: ללא הקשר ברירת מחדל + with_no_default_tags: וללא תגיות ברירת מחדל search: - contexts_matching_query: "הקשרים תואמים לשאילתא" - notes_matching_query: "פתקיות תואמות שאילתא" - no_results: "החיפוש לא הניב תוצאות" - projects_matching_query: "פרוייקטים תואמים שאילתא" - tags_matching_query: "תגיות תואמות לשאילתא" - todos_matching_query: "משימות תואמות שאילתא" + contexts_matching_query: הקשרים תואמים לשאילתא + no_results: החיפוש לא הניב תוצאות + notes_matching_query: פתקיות תואמות שאילתא + projects_matching_query: פרוייקטים תואמים שאילתא + tags_matching_query: תגיות תואמות לשאילתא + todos_matching_query: משימות תואמות שאילתא shared: - add_action: "הוספת פעולה" - add_actions: "הוספת פעולה" - add_context: "הוספת הקשר" - context_for_all_actions: "הקשר לכל הפעולות" - hide_action_form_title: "הסתרת טופס פעולות חדשות" - hide_form: "הסתרת טופס" - make_actions_dependent: "יצירת תלות בין פעולות" - multiple_next_actions: "פעולות המשך מרובות (פעולה אחת בשורה)" - project_for_all_actions: "פרוייקט לכל הפעולות" - separate_tags_with_commas: "מופרד בפסיקים" - tags_for_all_actions: "תגיות לכל הפעולות (יש להפריד בפסיקים)" - toggle_multi: "הוספת פעולות המשך מרובות" - toggle_multi_title: "טופס שינוי מצב פעולה בודדת / פעולות מרובות" - toggle_single: "הוספת פעולת המשך" - toggle_single_title: "הוספת פעולת המשך חדשה" + add_action: הוספת פעולה + add_actions: הוספת פעולה + add_context: הוספת הקשר + context_for_all_actions: הקשר לכל הפעולות + hide_action_form_title: הסתרת טופס פעולות חדשות + hide_form: הסתרת טופס + make_actions_dependent: יצירת תלות בין פעולות + multiple_next_actions: פעולות המשך מרובות (פעולה אחת בשורה) + project_for_all_actions: פרוייקט לכל הפעולות + separate_tags_with_commas: מופרד בפסיקים + tags_for_all_actions: תגיות לכל הפעולות (יש להפריד בפסיקים) + toggle_multi: הוספת פעולות המשך מרובות + toggle_multi_title: טופס שינוי מצב פעולה בודדת / פעולות מרובות + toggle_single: הוספת פעולת המשך + toggle_single_title: הוספת פעולת המשך חדשה sidebar: - list_empty: "אין" - list_name_active_contexts: "הקשרים פעילים" - list_name_active_projects: "פרוייקטים פעילים" - list_name_completed_projects: "פרוייקטים שהסתיימו" - list_name_hidden_contexts: "הקשרים מוסתרים" - list_name_hidden_projects: "פרוייקטים מוסתרים" + list_empty: אין + list_name_active_contexts: הקשרים פעילים + list_name_active_projects: פרוייקטים פעילים + list_name_completed_projects: פרוייקטים שהסתיימו + list_name_hidden_contexts: הקשרים מוסתרים + list_name_hidden_projects: פרוייקטים מוסתרים states: - active: "פעיל" - active_plural: "פעילים" - blocked: "נחסם" - blocked_plural: "חסומים" - completed: "הסתיים" - completed_plural: "הסתיימו" - current: "עדכני" - current_plural: "מעודכנים" - hidden: "מוסתרים" - hidden_plural: "מוסתרים" - review: "מתוארך" - review_plural: "מתוארכים" - stalled: "נעצר" - stalled_plural: "עצורים" - visible: "גלוי" - visible_plural: "גלויים" + active: פעיל + active_plural: פעילים + blocked: נחסם + blocked_plural: חסומים + close: Closed + closed_plural: Closed + completed: הסתיים + completed_plural: הסתיימו + contexts: + ":": ":" + active: Active contexts + closed: Closed contexts + hidden: Hidden contexts + current: עדכני + current_plural: מעודכנים + hidden: מוסתרים + hidden_plural: מוסתרים + projects: + ":": ":" + active: Active projects + blocked: Blocked + closed: Closed projects + completed: Completed + current: Current + hidden: Hidden projects + review: Review + stalled: Stalled + review: מתוארך + review_plural: מתוארכים + stalled: נעצר + stalled_plural: עצורים + visible: גלוי + visible_plural: גלויים stats: - actions: "פעולות" - actions_30days_title: "פעולות ב-30 הימים האחרונים" - actions_actions_avg_created_30days: "ב-30 הימים האחרונים נוצרו בממוצע %{count} - פעולות" - actions_avg_completed: "והסתיימו בממוצע %{count} פעולות לחודש" - actions_avg_completed_30days: "והסתיימו בממוצע %{count} פעולות ליום" - actions_avg_completion_time: "מכל הפעוליות שנסתיימות הזמן הממוצע לסיום הוא %{count} - ימים" - actions_avg_created: "ב-12 החודשים האחרונים יוצרו במוצע %{count} פעולות" + action_completion_time_title: זמן סיום (כל הפעולות שהסתיימו) + action_selection_title: מסלולים::בחירת פעולה + actions: פעולות + actions_30days_title: פעולות ב-30 הימים האחרונים + actions_actions_avg_created_30days: ב-30 הימים האחרונים נוצרו בממוצע %{count} פעולות + actions_avg_completed: והסתיימו בממוצע %{count} פעולות לחודש + actions_avg_completed_30days: והסתיימו בממוצע %{count} פעולות ליום + actions_avg_completion_time: מכל הפעוליות שנסתיימות הזמן הממוצע לסיום הוא %{count} ימים + actions_avg_created: ב-12 החודשים האחרונים יוצרו במוצע %{count} פעולות actions_day_of_week_legend: - day_of_week: "יום בשבוע" - number_of_actions: "מספר פעולות" - actions_day_of_week_title: "יום בשבוע (כל הפעולות)" + day_of_week: יום בשבוע + number_of_actions: מספר פעולות + actions_day_of_week_title: יום בשבוע (כל הפעולות) actions_dow_30days_legend: - day_of_week: "יום בשבוע" - number_of_actions: "מספר פעולות" - actions_dow_30days_title: "יום בשבוע (30 הימים האחרונים(" - actions_further: "ואילך" - actions_lastyear_title: "פעולות ב-12 החודשים האחרונים" - actions_last_year: "פעולות בשנים האחרונות" + day_of_week: יום בשבוע + number_of_actions: מספר פעולות + actions_dow_30days_title: יום בשבוע (30 הימים האחרונים( + actions_further: ואילך + actions_last_year: פעולות בשנים האחרונות actions_last_year_legend: - months_ago: "חודשים קודם" - number_of_actions: "מספר הפעולות" - actions_min_completion_time: "הזמן המזערי לסיום הוא %{time}." - actions_min_max_completion_days: "יחס זמן מיזערי/מירבי לסיום הוא %{min}/%{max}." - actions_selected_from_week: "פעולות נבחרות משבוע" - action_completion_time_title: "זמן סיום (כל הפעולות שהסתיימו)" - action_selection_title: "מסלולים::בחירת פעולה" - click_to_return: "הקלקה על %{link} תחזיר לעמוד הסטטיסטיקה" - click_to_return_link: "כאן" - click_to_show_actions_from_week: "הקלקה על %{link} תציג את הפעולות משבוע %{week} - ואילך" - click_to_update_actions: "הקלקה על הבר בגרף מעדכנת את הפעולה למטה" - contexts: "הקשרים" - current_running_time_of_incomplete_visible_actions: "זמן מצטבר לכל הפעולות הגלויות" - index_title: "מסלולים::סטטיסטיקה" + months_ago: חודשים קודם + number_of_actions: מספר הפעולות + actions_lastyear_title: פעולות ב-12 החודשים האחרונים + actions_min_completion_time: הזמן המזערי לסיום הוא %{time}. + actions_min_max_completion_days: יחס זמן מיזערי/מירבי לסיום הוא %{min}/%{max}. + actions_selected_from_week: פעולות נבחרות משבוע + click_to_return: הקלקה על %{link} תחזיר לעמוד הסטטיסטיקה + click_to_return_link: כאן + click_to_show_actions_from_week: הקלקה על %{link} תציג את הפעולות משבוע %{week} ואילך + click_to_update_actions: הקלקה על הבר בגרף מעדכנת את הפעולה למטה + contexts: הקשרים + current_running_time_of_incomplete_visible_actions: זמן מצטבר לכל הפעולות הגלויות + index_title: מסלולים::סטטיסטיקה labels: - avg_completed: "הסתיימו בממוצע" - avg_created: "נוצרו בממוצע" - completed: "הסתיימו" - created: "נוצרו" + avg_completed: הסתיימו בממוצע + avg_created: נוצרו בממוצע + completed: הסתיימו + created: נוצרו month_avg_completed: "%{months} הסתיימו בממוצע לחודש" month_avg_created: "%{months} נוצרו בממוצע לחודש" legend: - actions: "פעולות" - day_of_week: "יום בשבוע" - months_ago: "חודשים קודם" - number_of_actions: "מספר פעולות" - number_of_days: "מספר ימים קודם לכן" - percentage: "אחוז" - running_time: "זמן מצטבר לפעולה (שבועות)" - more_stats_will_appear: "סטטיסטיקות נוספות יוצגו כאן לאחר הוספת פעולות נוספות." - no_actions_selected: "לא נבחרו פעולות" - no_tags_available: "אין תגיות זמינות" - open_per_week: "פעולות המשך (מוצגות או מוסתרות) לכל שבוע" + actions: פעולות + day_of_week: יום בשבוע + months_ago: חודשים קודם + number_of_actions: מספר פעולות + number_of_days: מספר ימים קודם לכן + percentage: אחוז + running_time: זמן מצטבר לפעולה (שבועות) + more_stats_will_appear: סטטיסטיקות נוספות יוצגו כאן לאחר הוספת פעולות נוספות. + no_actions_selected: לא נבחרו פעולות + no_tags_available: אין תגיות זמינות + open_per_week: פעולות המשך (מוצגות או מוסתרות) לכל שבוע open_per_week_legend: - actions: "פעולות" - weeks: "שבועות קודם לכן" + actions: פעולות + weeks: שבועות קודם לכן other_actions_label: "(אחרים)" - projects: "פרוייקטים" - running_time_all: "זמן מצטבר לכל הפעולות שלא הסתיימו" + projects: פרוייקטים + running_time_all: זמן מצטבר לכל הפעולות שלא הסתיימו running_time_all_legend: - actions: "פעולות" - percentage: "אחוז" - running_time: "זמן מצטבר לפעולות (שבועות). הקלקה על הבר למידע נוסף" + actions: פעולות + percentage: אחוז + running_time: זמן מצטבר לפעולות (שבועות). הקלקה על הבר למידע נוסף running_time_legend: - actions: "פעולות" - percentage: "אחוז" - weeks: "זמן מצטבר לפעולות (שבועות). הקלקה על הבר למידע נוסף" - spread_of_actions_for_all_context: "פיזור פעולות לכל ההקשרים" - spread_of_running_actions_for_visible_contexts: "פיזור הפעולות להקשרים גלויים" - tags: "תגיות" - tag_cloud_90days_description: "ענן התגיות מכיל תגיות עבור פעולות שנוצרו או הסתיימו - ב-90 הימים האחרונים." - tag_cloud_90days_title: "ענן תגיות לפעולות ב-90 הימים האחרונים" - tag_cloud_description: "ענן התגיות מכיל תגיות לכל הפעולות (הסתיימו, לא הסתיימו, - גלויות ו/או מוסתרות(" - tag_cloud_title: "ענן תגיות לכל הפעולות" - time_of_day: "זמן ביום (כל הפעולות)" + actions: פעולות + percentage: אחוז + weeks: זמן מצטבר לפעולות (שבועות). הקלקה על הבר למידע נוסף + spread_of_actions_for_all_context: פיזור פעולות לכל ההקשרים + spread_of_running_actions_for_visible_contexts: פיזור הפעולות להקשרים גלויים + tag_cloud_90days_description: ענן התגיות מכיל תגיות עבור פעולות שנוצרו או הסתיימו ב-90 הימים האחרונים. + tag_cloud_90days_title: ענן תגיות לפעולות ב-90 הימים האחרונים + tag_cloud_description: ענן התגיות מכיל תגיות לכל הפעולות (הסתיימו, לא הסתיימו, גלויות ו/או מוסתרות( + tag_cloud_title: ענן תגיות לכל הפעולות + tags: תגיות + time_of_day: זמן ביום (כל הפעולות) time_of_day_legend: - number_of_actions: "מספר פעולות" - time_of_day: "זמן ביום" - tod30: "זמן ביום (30 ימים אחרוני)" + number_of_actions: מספר פעולות + time_of_day: זמן ביום + tod30: זמן ביום (30 ימים אחרוני) tod30_legend: - number_of_actions: "מספר פעולות" - time_of_day: "זמן ביום" + number_of_actions: מספר פעולות + time_of_day: זמן ביום top10_longrunning: 10 הפרוייקטים שרצים הכי הרבה זמן - top10_projects: "עשרת הפרוייקטים המובילים" - top10_projects_30days: "עשרת הפרוייקטים המובילים ב-30 הימים האחרונים" + top10_projects: עשרת הפרוייקטים המובילים + top10_projects_30days: עשרת הפרוייקטים המובילים ב-30 הימים האחרונים top5_contexts: 5 הקשרים מובילים - top5_visible_contexts_with_incomplete_actions: 5 ההקשרים המובילים עם פעולות שלא - הסתיימו - totals: "סיכומים" + top5_visible_contexts_with_incomplete_actions: 5 ההקשרים המובילים עם פעולות שלא הסתיימו + totals: סיכומים + totals_action_count: קיימות %{count} פעולות בסך הכל totals_actions_completed: "%{count} מהם הסתיימו" - totals_action_count: "קיימות %{count} פעולות בסך הכל" - totals_active_project_count: "מתוכם, %{count} הם פרוייקטים פעילים" + totals_active_project_count: מתוכם, %{count} הם פרוייקטים פעילים totals_blocked_actions: "%{count} תלויים בסיום המשימות שלהם" totals_completed_project_count: "%{count} מהם פרוייקטים שנסתיימו." - totals_context_count: "קיימים %{count} הקשרים." - totals_deferred_actions: "מהן %{count} פעולות דחויות במִזְכָּר" - totals_first_action: "מאז הפעולה הראשונה ב-%{date}" - totals_hidden_context_count: "ו-%{count} בהקשרים מוסתרים." + totals_context_count: קיימים %{count} הקשרים. + totals_deferred_actions: מהן %{count} פעולות דחויות במִזְכָּר + totals_first_action: מאז הפעולה הראשונה ב-%{date} + totals_hidden_context_count: ו-%{count} בהקשרים מוסתרים. totals_hidden_project_count: "%{count} מוסתרים" - totals_incomplete_actions: "קיימות %{count} פעולות שלא הסתיימו" - totals_project_count: "קיימים %{count} פרוייקטים." - totals_tag_count: "קיימים %{count} תגיות המשוייכות לפעולות." - totals_unique_tags: "מתוך תגיות אלו, %{count} ייחודיות." - totals_visible_context_count: "מתוך אלו %{count} הקשרים גלויים" - within_one: "תוך 1" + totals_incomplete_actions: קיימות %{count} פעולות שלא הסתיימו + totals_project_count: קיימים %{count} פרוייקטים. + totals_tag_count: קיימים %{count} תגיות המשוייכות לפעולות. + totals_unique_tags: מתוך תגיות אלו, %{count} ייחודיות. + totals_visible_context_count: מתוך אלו %{count} הקשרים גלויים + within_one: תוך 1 support: array: last_word_connector: ", ו-" - two_words_connector: "ו-" + two_words_connector: ו- words_connector: "," select: - prompt: "יש לבצע בחירה" + prompt: יש לבצע בחירה time: am: לפנה"צ formats: @@ -630,263 +745,322 @@ he: month_day: "%B %d" short: "%d %b %H:%M" stats: "%a %d-%m" + time: Time pm: אחה"צ todos: - action_deferred: "הפעולה '%{description}' נדחתה" - action_deleted_error: "נכשלה מחיקת הפעולה" - action_deleted_success: "פעולת המשך נמחקה בהצלחה" + action_deferred: הפעולה '%{description}' נדחתה + action_deleted_error: נכשלה מחיקת הפעולה + action_deleted_success: פעולת המשך נמחקה בהצלחה action_due_on: "(פעולה עד %{date})" - action_marked_complete: "הפעולה '%{description}' סומנה כ- %{completed}" - action_marked_complete_error: "הפעולה '%{description}'־לא־ סומנה - כ - %{completed} עקב שגיאת שרת" - action_saved: "פעולה נשמרה" - action_saved_to_tickler: "פעולה נשמרה למִזְכָּר" - added_dependency: "נוספה %{dependency} כתלות" - added_new_context: "נוסף הקשר חדש" - added_new_next_action: "נוספה פעולת המשך חדשה" - added_new_next_action_plural: "נוספו פעולות המשך חדשות" - added_new_next_action_singular: "נוספה פעולת המשך חדשה" - added_new_project: "נוסף פרוייקט חדש" - add_another_dependency: "הוספת תלות נוספת" - add_new_recurring: "הוספת פעולה מחזורית חדשה" - all_completed: "כל הפעולות שהסתיימו" - all_completed_here: "כאן" - all_completed_tagged_page_title: "מסלולים::כל הפעולות שהסתיימו עם התגית %{tag_name}" - append_in_this_project: "בפרוייקט זה" - archived_tasks_title: "מסלולים: משימות שהסתיימו הועברו לארכיון" - blocked_by: "נחסם על ידי %{predecessors}" + action_marked_complete: הפעולה '%{description}' סומנה כ- %{completed} + action_marked_complete_error: הפעולה '%{description}'־לא־ סומנה כ - %{completed} עקב שגיאת שרת + action_saved: פעולה נשמרה + action_saved_to_tickler: פעולה נשמרה למִזְכָּר + actions: + completed: Completed actions + context_completed: Completed actions in this context + context_deferred_pending: Deferred/pending actions in this context + context_without_project: Actions without project in %{param} + home_completed: Completed actions + home_without_project: Actions without project + project_completed: Completed actions in this project + project_deferred_pending: Deferred/pending actions in this project + project_project: Actions in this project + tag_completed: Completed actions tagged with '%{param}' + tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_hidden: Hidden actions tagged with '%{param}' + add_another_dependency: הוספת תלות נוספת + add_new_recurring: הוספת פעולה מחזורית חדשה + added_dependency: נוספה %{dependency} כתלות + added_new_context: נוסף הקשר חדש + added_new_next_action: נוספה פעולת המשך חדשה + added_new_next_action_plural: נוספו פעולות המשך חדשות + added_new_next_action_singular: נוספה פעולת המשך חדשה + added_new_project: נוסף פרוייקט חדש + all_completed: כל הפעולות שהסתיימו + all_completed_here: כאן + all_completed_tagged_page_title: מסלולים::כל הפעולות שהסתיימו עם התגית %{tag_name} + append_in_this_project: בפרוייקט זה + archived_tasks_title: 'מסלולים: משימות שהסתיימו הועברו לארכיון' + blocked_by: נחסם על ידי %{predecessors} calendar: - due_next_week: "לשבוע הבא" - due_this_month: "תאריך יעד ליתרת חודש %{month}" - due_this_week: "להמשך השבוע" - due_today: "להיום" - get_in_ical_format: "קבלת לוח שנה זה בפורמט iCal" - calendar_page_title: "מסלולים::לוח שנה" - cannot_add_dependency_to_completed_todo: "אין אפשרות להוסיף פעולה זו כתלות לפעולה - שהסתיימה!" - clear_due_date: "מחיקת תאריך יעד" - clear_show_from_date: "נקה הצגה מתאריך" - completed: "הסתיימו" - completed_actions_with: "פעולות שהסתיימו עם התגית %{tag_name}" + due_after_this_month: Due in %{next_month} and later + due_next_week: לשבוע הבא + due_this_month: תאריך יעד ליתרת חודש %{month} + due_this_week: להמשך השבוע + due_today: להיום + get_in_ical_format: קבלת לוח שנה זה בפורמט iCal + calendar_page_title: מסלולים::לוח שנה + cannot_add_dependency_to_completed_todo: אין אפשרות להוסיף פעולה זו כתלות לפעולה שהסתיימה! + clear_due_date: מחיקת תאריך יעד + clear_show_from_date: נקה הצגה מתאריך + completed: הסתיימו + completed_actions: Completed actions + completed_actions_with: פעולות שהסתיימו עם התגית %{tag_name} completed_in_archive: - one: "קיימת בארכיון פעולה שהסתיימה." - other: "קיימות %{count} פעולות שהסתיימו בארכיון." - completed_last_day: "הסתיימו ב-24 שעות האחרונות" - completed_last_x_days: "הסתיימו ב-%{count} הימים האחרונים" - completed_recurrence_completed: "אין פעולת המשך לפעולה המחזורית שנמחקה. הפעולה - המחזורית נמחקה." - completed_recurring: "הסתיימו משימות מחזוריות" - completed_rest_of_month: "הסתיימו ביתרת החודש הנוכחי" - completed_rest_of_previous_month: "הסתיימו ביתרת החודש הקודם" - completed_rest_of_week: "הסתיימו ביתרת שבוע זה" - completed_tagged_page_title: "מסלולים::משימות שהסתיימו עם תגית '%{tag_name}'" - completed_tasks_title: "מסלולים::משימות שהושלמו" - confirm_delete: "האם למחוק את הפעילות '%{description}'?" - context_changed: "הקשר שונה ל-%{name}" - convert_to_project: "יצירת פרוייקט" - deferred_actions_with: "פעולות דחויות על תגית '%{tag_name}'" - deferred_pending_actions: "פעולות ממתינות/דחויות" - deferred_tasks_title: "מסלולים::מִזְכָּר" - defer_date_after_due_date: "תאריך הדחייה מאוחר מתאריך היעד. יש לערוך את תאריך - היעד בהתאם לפני בקשת הדחייה." + one: קיימת בארכיון פעולה שהסתיימה. + other: קיימות %{count} פעולות שהסתיימו בארכיון. + completed_last_day: הסתיימו ב-24 שעות האחרונות + completed_last_x_days: הסתיימו ב-%{count} הימים האחרונים + completed_recurrence_completed: אין פעולת המשך לפעולה המחזורית שנמחקה. הפעולה המחזורית נמחקה. + completed_recurring: הסתיימו משימות מחזוריות + completed_recurring_actions_title: TRACKS::Completed recurring actions + completed_rest_of_month: הסתיימו ביתרת החודש הנוכחי + completed_rest_of_previous_month: הסתיימו ביתרת החודש הקודם + completed_rest_of_week: הסתיימו ביתרת שבוע זה + completed_tagged_page_title: מסלולים::משימות שהסתיימו עם תגית '%{tag_name}' + completed_tasks_title: מסלולים::משימות שהושלמו + completed_today: Completed today + confirm_delete: האם למחוק את הפעילות '%{description}'? + context_changed: הקשר שונה ל-%{name} + convert_to_project: יצירת פרוייקט + defer_date_after_due_date: תאריך הדחייה מאוחר מתאריך היעד. יש לערוך את תאריך היעד בהתאם לפני בקשת הדחייה. defer_x_days: - one: "דחיה ביום" - other: "דחיה ב-%{count} ימים" - delete: "מחיקה" - deleted_success: "הפעולה נמחקה בהצלחה" - delete_action: "מחיקת פעולה" - delete_recurring_action_confirm: "האם למחוק את הפעילות המחזורית '%{description}'?" - delete_recurring_action_title: "מחיקת פעולה מחזורית" - depends_on: "תלוי ב" - depends_on_separate_with_commas: "תלוי ב- (יש להפריד בפסיקים(" - done: "הסתיים?" - drag_action_title: "יש לגרור אל פעולה אחרת כדי ליצור תלות בה" - due: "יעד" - edit: "עריכה" - edit_action: "עריכת פעולה" - edit_action_with_description: "עריכת הפעולה '%{description}'" - edit_recurring_todo: "ערכית פעולות מחזוריות" - error_completing_todo: "ארעה שגיעה בסיום / הפעלה של משימה %{description}" - error_deleting_item: "ארעה שגיאה במחיקת הפריט %{description}" - error_deleting_recurring: "ארעה שגיעה במחיקת המשימה המחזורית '%{description}'" - error_removing_dependency: "התרחשה שגיאה בהסרת התלות" - error_saving_recurring: "ארעה שגיעה בשמירת המשימה המחזורית '%{description}'" - error_starring: "הדגשת המשימה '%{description}' לא צלחה" - error_starring_recurring: "הדגשת המשימה המחזורית '%{description}' לא צלחה" + one: דחיה ביום + other: דחיה ב-%{count} ימים + deferred_actions_with: פעולות דחויות על תגית '%{tag_name}' + deferred_pending_actions: פעולות ממתינות/דחויות + deferred_tasks_title: מסלולים::מִזְכָּר + delete: מחיקה + delete_action: מחיקת פעולה + delete_recurring_action_confirm: האם למחוק את הפעילות המחזורית '%{description}'? + delete_recurring_action_title: מחיקת פעולה מחזורית + deleted_success: הפעולה נמחקה בהצלחה + depends_on: תלוי ב + depends_on_separate_with_commas: תלוי ב- (יש להפריד בפסיקים( + done: הסתיים? + drag_action_title: יש לגרור אל פעולה אחרת כדי ליצור תלות בה + due: יעד + edit: עריכה + edit_action: עריכת פעולה + edit_action_with_description: עריכת הפעולה '%{description}' + edit_recurring_todo: ערכית פעולות מחזוריות + error: + invalid_due_date: Invalid due date + invalid_show_from_date: Invalid show from date + error_completing_todo: ארעה שגיעה בסיום / הפעלה של משימה %{description} + error_deleting_item: ארעה שגיאה במחיקת הפריט %{description} + error_deleting_recurring: ארעה שגיעה במחיקת המשימה המחזורית '%{description}' + error_removing_dependency: התרחשה שגיאה בהסרת התלות + error_saving_recurring: ארעה שגיעה בשמירת המשימה המחזורית '%{description}' + error_starring: הדגשת המשימה '%{description}' לא צלחה + error_starring_recurring: הדגשת המשימה המחזורית '%{description}' לא צלחה error_toggle_complete: לא ניתן לסמן משימה כ"הסתיימה" + feed_title_in_context: בהקשר '%{context}' + feed_title_in_project: בפרוייקט '%{project}' feeds: - completed: "הסתיים: %{date}" - due: "יעד %{date}" - feed_title_in_context: "בהקשר '%{context}'" - feed_title_in_project: "בפרוייקט '%{project}'" + completed: 'הסתיים: %{date}' + due: יעד %{date} has_x_pending: - one: "בעל פעולה דחויה אחת" - other: "מכיל %{count} פעולת ממתינות" - hidden_actions: "פעולות מוסתרות" - in_hidden_state: "במצב מוסתר" - in_pending_state: "במצב המתנה" - list_incomplete_next_actions: "רשימת פעולות המשך שלא הסתיימו" - list_incomplete_next_actions_with_limit: "רישמת %{count} פעולות ההמשך שלא הסתיימו" - mobile_todos_page_title: "כל הפעולות" - new_related_todo_created: "משימה חדשה הוספה למשימה מחזורית זו" - new_related_todo_created_short: "יצירת משימה חדשה" - new_related_todo_not_created_short: "לא נוצרה משימה" - next_actions_description: "מסנן:" + one: בעל פעולה דחויה אחת + other: מכיל %{count} פעולת ממתינות + hidden_actions: פעולות מוסתרות + in_hidden_state: במצב מוסתר + in_pending_state: במצב המתנה + list_incomplete_next_actions: רשימת פעולות המשך שלא הסתיימו + list_incomplete_next_actions_with_limit: רישמת %{count} פעולות ההמשך שלא הסתיימו + mark_complete: Mark complete + mobile_todos_page_title: כל הפעולות + new_related_todo_created: משימה חדשה הוספה למשימה מחזורית זו + new_related_todo_created_short: יצירת משימה חדשה + new_related_todo_not_created_short: לא נוצרה משימה + next_action_description: תיאור פעולת המשך + next_action_needed: יש להזין לפחות פעולת המשך אחת + next_actions_description: 'מסנן:' next_actions_description_additions: - completed: "ב-%{count} הימים האחרונים" - due_date: "עם תאריך יעד %{due_date} או מוקדם יותר" + completed: ב-%{count} הימים האחרונים + due_date: עם תאריך יעד %{due_date} או מוקדם יותר next_actions_due_date: - due_in_x_days: "יעד בעוד %{days} ימים" - due_today: "להיום" - due_tomorrow: "למחר" - overdue_by: "באיחור של %{days} יום" - overdue_by_plural: "באיחור של %{days} ימים" - next_actions_title: "מסלולים - פעולות המשך" + due_in_x_days: יעד בעוד %{days} ימים + due_today: להיום + due_tomorrow: למחר + overdue_by: באיחור של %{days} יום + overdue_by_plural: באיחור של %{days} ימים + next_actions_title: מסלולים - פעולות המשך next_actions_title_additions: - completed: "פעולות שהסתימו" - due_today: "להיום" - due_within_a_week: "תוך שבוע" - next_action_description: "תיאור פעולת המשך" - next_action_needed: "יש להזין לפחות פעולת המשך אחת" - no_actions_due_this_week: "אין פעולות המיועדות להמשך השבוע" - no_last_completed_actions: "לא נמצאו פעולות שהסתיימו" + completed: פעולות שהסתימו + due_today: להיום + due_within_a_week: תוך שבוע + no_actions: + completed: Currently there are no completed actions + completed_recurring: Currently there are no completed recurring todos + completed_rest_of_month: No actions were completed in the rest of this month + completed_rest_of_week: No actions were completed in the rest of this week + completed_today: No actions were completed today + context: Currently there are no incomplete actions in this context + deferred_pending: Currently there are no deferred or pending actions + due_after_this_month: No actions due after this month + due_next_week: No actions due in next week + due_this_month: No actions due in rest of this month + due_this_week: No actions due this week + due_today: No actions due today + hidden: Currently there are no hidden actions found + not_done: Currently there are no incomplete actions + not_done_context: Currently there are no incomplete actions in this context + not_done_project: Currently there are no incomplete actions in this project + not_done_with_tag: Currently there are no incomplete actions with the tag '%{param}' + project: Currently there are no incomplete actions in this project + recurring_todos: Currently there are no recurring todos + tag_hidden: Currently there are no hidden actions found + title: No actions found + without_project: Currently there are no actions without a project + no_actions_due_this_week: אין פעולות המיועדות להמשך השבוע + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with + no_last_completed_actions: לא נמצאו פעולות שהסתיימו no_project: "--אין פרוייקט--" - overdue: "באיחור" - pending: "ממתין" + no_recurring_todos: No recurring todos + notes: Notes + overdue: באיחור + pending: ממתין recurrence: - daily: "יומי" - daily_every_number_day: "כל %{number} ימים" - daily_options: "הגדרות לפעולות מחזוריות יומיות" - day_x_on_every_x_month: "ביום %{day} בכל %{month} חודש" - ends_on: "מסתיים ב" - ends_on_date: "מסתיים ב-%{date}" - ends_on_number_times: "מסתיים לאחר %{number} פעמים" - every_work_day: "בכל יום עבודה" - monthly: "חודשי" - monthly_every_xth_day: "יום %{day} ה -%{day_of_week} בכל %{month} חודש" - monthly_options: "הגדרות לפעולות בחזוריות חודשית" - no_end_date: "אין תאריך סיום" + daily: יומי + daily_every_number_day: כל %{number} ימים + daily_options: הגדרות לפעולות מחזוריות יומיות + day_x_on_every_x_month: ביום %{day} בכל %{month} חודש + ends_on: מסתיים ב + ends_on_date: מסתיים ב-%{date} + ends_on_number_times: מסתיים לאחר %{number} פעמים + every_work_day: בכל יום עבודה + monthly: חודשי + monthly_every_xth_day: יום %{day} ה -%{day_of_week} בכל %{month} חודש + monthly_options: הגדרות לפעולות בחזוריות חודשית + no_end_date: אין תאריך סיום pattern: - due: "יעד" - every_day: "כל יום" - every_month: "כל חודש" - every_n: "כל %{n}" - every_xth_day_of_every_n_months: "כל %{x} %{day} בכל %{n_months}" - every_year_on: "בכל שנה בתאריך %{date}" - first: "ראשון" - fourth: "רביעי" - from: "מ" - last: "אחרון" - on_day_n: "ביום %{n}" - on_work_days: "בימי עבודה" - second: "שני" - show: "הצגה" - the_xth_day_of_month: "היום ה- %{x} %{day} בחודש %{month}" - third: "שלישי" - times: "כ-%{number} פעמים" - until: "עד" - weekly: "שבועי" - starts_on: "מתחיל ב" - weekly: "שבועי" - weekly_every_number_week: "חוזר כל %{number} שבוע ב" - weekly_options: "הגדרות לפעולות במחזוריות שבועית" - yearly: "שנתית" - yearly_every_xth_day: "יום %{day} ה -%{day_of_week} בכל %{month} חודש" - yearly_every_x_day: "כל %{month} %{day}" - yearly_options: "הגדרות לפעולות במחזוריות שנתיות" - recurrence_completed: "אין פעולת המשך לפעולה המחזורית שסוימה. המחזוריות הסתיימה." - recurrence_period: "תקופת מחזוריות" - recurring_actions_title: "מסלולים::פעולות מחזוריות" - recurring_action_deleted: "פעולה נמחקה. מאחר והפעולה מחזורית. פעולה חדשה נוספה" - recurring_action_saved: "פעולה מחזורית נשמרה" - recurring_deleted_success: "הפעולה המחזורית נמחקה בהצלחה" - recurring_pattern_removed: "הדפוס המחזורי הוסר מ-%{count}" - recurring_todos: "משימות מחזוריות" - removed_predecessor: "הוסרה%{successor} כתלות של %{predecessor}.־" - remove_dependency: "הסרת תלות (לא מוחק את הפעולה)" - scheduled_overdue: "תוזמן לתצוגה לפני %{days} ימים" - see_all_completed: "ניתן לראות כל כל הפעולות שהסתיימו כאן: %{link}" + day_names: '["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]' + due: יעד + every_day: כל יום + every_month: כל חודש + every_n: כל %{n} + every_n_days: every %{n} days + every_n_months: every %{n} months + every_xth_day_of_every_n_months: כל %{x} %{day} בכל %{n_months} + every_year_on: בכל שנה בתאריך %{date} + first: ראשון + fourth: רביעי + from: מ + last: אחרון + month_names: '[nil, "January", "February", "Match", "April", "May", "June", "July", "August", "September", "October", "November", "December"]' + on_day_n: ביום %{n} + on_work_days: בימי עבודה + second: שני + show: הצגה + the_xth_day_of_month: היום ה- %{x} %{day} בחודש %{month} + third: שלישי + times: כ-%{number} פעמים + until: עד + weekly: שבועי + recurrence_on: + due_date: set the actions due date + from_tickler: set the date the action should be shown (do not set a due date) + options: Use the calculated date to + show_always: always + show_days_before: not until %{days} days before the due date + show_options: Show the action + starts_on: מתחיל ב + weekly: שבועי + weekly_every_number_week: חוזר כל %{number} שבוע ב + weekly_options: הגדרות לפעולות במחזוריות שבועית + yearly: שנתית + yearly_every_x_day: כל %{month} %{day} + yearly_every_xth_day: יום %{day} ה -%{day_of_week} בכל %{month} חודש + yearly_options: הגדרות לפעולות במחזוריות שנתיות + recurrence_completed: אין פעולת המשך לפעולה המחזורית שסוימה. המחזוריות הסתיימה. + recurrence_period: תקופת מחזוריות + recurring_action_deleted: פעולה נמחקה. מאחר והפעולה מחזורית. פעולה חדשה נוספה + recurring_action_saved: פעולה מחזורית נשמרה + recurring_actions_title: מסלולים::פעולות מחזוריות + recurring_deleted_success: הפעולה המחזורית נמחקה בהצלחה + recurring_pattern_removed: הדפוס המחזורי הוסר מ-%{count} + recurring_todos: משימות מחזוריות + remove_dependency: הסרת תלות (לא מוחק את הפעולה) + removed_predecessor: הוסרה%{successor} כתלות של %{predecessor}.־ + scheduled_overdue: תוזמן לתצוגה לפני %{days} ימים + see_all_completed: 'ניתן לראות כל כל הפעולות שהסתיימו כאן: %{link}' set_to_pending: "%{task} הוגדרה כממתינה" - show_from: "הצגה מ-" - show_in_days: "הצג בעוד %{days} ימים" - show_on_date: "הצג בתאריך %{date}" - show_today: "הצגת היום" - show_tomorrow: "הצגת מחר" - star_action: "הדגשת פעולה" - star_action_with_description: "הדגשת פעילות '%{description}'" - tagged_page_title: "מסלולים::תגיות עם '%{tag_name}'" - tagged_with: "מתוייג ב- ‘%{tag_name}’" - tags: "תגיות (מופרדות בפסיקים)" - task_list_title: "מסלולים::רשימת משימות" + show_from: הצגה מ- + show_in_days: הצג בעוד %{days} ימים + show_on_date: הצג בתאריך %{date} + show_today: הצגת היום + show_tomorrow: הצגת מחר + star_action: הדגשת פעולה + star_action_with_description: הדגשת פעילות '%{description}' + tagged_page_title: מסלולים::תגיות עם '%{tag_name}' + tagged_with: מתוייג ב- ‘%{tag_name}’ + tags: תגיות (מופרדות בפסיקים) + task_list_title: מסלולים::רשימת משימות tickler_items_due: - one: "אחד מהמִזְכָּרים הגיע לתאריך היעד - יש לרענן העמוד להצגה." + one: אחד מהמִזְכָּרים הגיע לתאריך היעד - יש לרענן העמוד להצגה. other: "%{count} מהמִזְכָּרים הגיעו לתאריך היעד - יש לרענן העמוד להצגה." - to_tickler: "למִזְכָּר" - unable_to_add_dependency: "לא ניתן להוסיף תלות" - unresolved_dependency: "הערך שהוכנס בתלות לא תאם לאף פעולה קיימת. הערך לא ישמר - עם יתרת הפעולה. להמשיך?" - was_due_on_date: "היה מיועד עד %{date}" + to_tickler: למִזְכָּר + unable_to_add_dependency: לא ניתן להוסיף תלות + unresolved_dependency: הערך שהוכנס בתלות לא תאם לאף פעולה קיימת. הערך לא ישמר עם יתרת הפעולה. להמשיך? + was_due_on_date: היה מיועד עד %{date} users: - account_signup: "רישום לחשבון" - auth_change_submit: "שינוי שיטת אימות" - auth_type_updated: "שיטת אימות עודכנה" - auth_type_update_error: "ארעה שגיאה בעידכון שיטת האימות: %{error_messages}" - change_authentication_type: "שינוי שיטת הזדהות" - change_auth_type_title: "מסלולים::שינוי שיטת הזדהות" - change_password_prompt: "יש לכתוב את הסיסמא החדשה בשדות שלמטה ולהקליק 'שנה סיסמא' - כדי להחליף את הסיסמא הנוכחית בחדשה." - change_password_submit: "שינוי סיסמא" - change_password_title: "מסלולים::שינוי סיסמא" - choose_password: "בחירת סיסמא" - confirm_password: "אישור סיסמא" - desired_login: "משתמש כניסה רצוי" - destroy_confirmation: "אזהרה: הפעולה תמחק את המשתמש '%{login}', כל הפעולות, הפרוייקטים - והפתקים. האם להמשיך?" - destroy_error: "ארעה שגיאה במחיקת המשתמש %{login}" - destroy_successful: "משתמש %{login} הושמד בהצלחה" - destroy_user: "השמדת משתמש" - failed_to_delete_user: "מחיקת המשתמש %{username} נכשלה" - first_user_heading: "ברוכים הבאים אל מסלולים. כדי להתחיל, יש ליצור חשבון מנהל:" - identity_url: "כתובת זהות" - label_auth_type: "שיטת אימות" - manage_users: "ניהול משתמשים" - new_password_label: "סיסמא חדשה" - new_token_generated: "אסימון חדש נוצר בהצלחה" - new_user_heading: "רישום משתמש חדש:" - new_user_title: "מסלולים::רישום משתמש כמנהל" - no_signups_title: "מסלולים::אין רישומים" - openid_ok_pref_failed: "כתובת הזהות %{url} .אומתה בהצלחה אך ארעה תקלה בשמירת הגדרות - ההזדהות" - openid_url_verified: "כתובת הזהות %{url} .אומתה בהצלחה ואופן האימות נקבע ל-OpenID." - password_confirmation_label: "אימות סיסמא" - password_updated: "סיסמא עודכנה." + account_signup: רישום לחשבון + approve_tos: I approve the Terms of Service + auth_change_submit: שינוי שיטת אימות + auth_type_update_error: 'ארעה שגיאה בעידכון שיטת האימות: %{error_messages}' + auth_type_updated: שיטת אימות עודכנה + change_auth_type_title: מסלולים::שינוי שיטת הזדהות + change_authentication_type: שינוי שיטת הזדהות + change_password_prompt: יש לכתוב את הסיסמא החדשה בשדות שלמטה ולהקליק 'שנה סיסמא' כדי להחליף את הסיסמא הנוכחית בחדשה. + change_password_submit: שינוי סיסמא + change_password_title: מסלולים::שינוי סיסמא + choose_password: בחירת סיסמא + confirm_password: אישור סיסמא + desired_login: משתמש כניסה רצוי + destroy_confirmation: 'אזהרה: הפעולה תמחק את המשתמש ''%{login}'', כל הפעולות, הפרוייקטים והפתקים. האם להמשיך?' + destroy_error: ארעה שגיאה במחיקת המשתמש %{login} + destroy_successful: משתמש %{login} הושמד בהצלחה + destroy_user: השמדת משתמש + email_address: Email address + failed_to_delete_user: מחיקת המשתמש %{username} נכשלה + first_user_heading: 'ברוכים הבאים אל מסלולים. כדי להתחיל, יש ליצור חשבון מנהל:' + first_user_title: TRACKS::Sign up as the admin user + identity_url: כתובת זהות + label_auth_type: שיטת אימות + manage_users: ניהול משתמשים + new_password_label: סיסמא חדשה + new_token_generated: אסימון חדש נוצר בהצלחה + new_user_heading: 'רישום משתמש חדש:' + new_user_title: מסלולים::רישום משתמש כמנהל + no_signups_title: מסלולים::אין רישומים + openid_ok_pref_failed: כתובת הזהות %{url} .אומתה בהצלחה אך ארעה תקלה בשמירת הגדרות ההזדהות + openid_url_verified: כתובת הזהות %{url} .אומתה בהצלחה ואופן האימות נקבע ל-OpenID. + password_confirmation_label: אימות סיסמא + password_updated: סיסמא עודכנה. register_with_cas: עם משתמש השא"מ שלך - select_authentication_type: "יש לבחור את שיטת הזיהוי החדשה ולהלליק 'שינוי שיטת - הזדהות' לבחירת השיטה הנוכחית" - signup: "רישום" - signup_new_user: "רשום משתמש חדש" - signup_successful: "רישום מוצלח עבור משתמש %{username}." - successfully_deleted_user: "משתמש %{username} נמחק בהצלחה" - total_actions: "סך פעולות" - total_contexts: "סך הקשרים" - total_notes: "כל הפתקיות" - total_projects: "פרויקטים בסך הכל" - total_users_count: "קיימים %{count} משתמשים" - user_created: "משתמש נוצר" - you_have_to_reset_your_password: "יש לאפס את הסיסמא" + select_authentication_type: יש לבחור את שיטת הזיהוי החדשה ולהלליק 'שינוי שיטת הזדהות' לבחירת השיטה הנוכחית + signup: רישום + signup_new_user: רשום משתמש חדש + signup_successful: רישום מוצלח עבור משתמש %{username}. + successfully_deleted_user: משתמש %{username} נמחק בהצלחה + tos_link: read the Terms of Service + total_actions: סך פעולות + total_contexts: סך הקשרים + total_notes: כל הפתקיות + total_projects: פרויקטים בסך הכל + total_users_count: קיימים %{count} משתמשים + user_created: משתמש נוצר + you_have_to_reset_your_password: יש לאפס את הסיסמא will_paginate: - next_label: "הבא »" + next_label: הבא » page_entries_info: - multi_page: "מציג %{model} %{from} - %{to} מתוך %{count} בסך הכל" - multi_page_html: "מציג %{model} %{from} - %{to} מתוך %{count} - בסך הכל" + multi_page: מציג %{model} %{from} - %{to} מתוך %{count} בסך הכל + multi_page_html: מציג %{model} %{from} - %{to} מתוך %{count} בסך הכל single_page: - one: "מציג %{model} אחד" - other: "מציג את כל %{count} %{model}" - zero: "לא נמצא %{model}" + one: מציג %{model} אחד + other: מציג את כל %{count} %{model} + zero: לא נמצא %{model} single_page_html: - one: "מציג 1 %{model}" - other: "מציג כל %{count} %{model}" - zero: "לא נמצא %{model}" + one: מציג 1 %{model} + other: מציג כל %{count} %{model} + zero: לא נמצא %{model} page_gap: "…" previous_label: "« הקודם" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index e71eb247..c92aca00 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -43,6 +43,7 @@ nl: user: auth_type: Auth type display_name: Schermnaam + email: Email address first_name: Voornaam last_name: Achternaam login: Login @@ -69,8 +70,8 @@ nl: odd: moet oneven zijn record_invalid: 'Validatie mislukt: %{errors}' restrict_dependent_destroy: - one: Kan record niet verwijderen omdat een afhankelijk %{record} bestaat many: Kan record niet verwijderen omdat afhankelijke %{record} bestaan + one: Kan record niet verwijderen omdat een afhankelijk %{record} bestaat taken: is al gepakt too_long: is te lang (maximum is %{count} karakters) too_short: is te kort (minimum is %{count} karakters) @@ -124,12 +125,12 @@ nl: months: maanden next: Volgende none: Geen + not_available_abbr: n/b note: one: 1 notitie other: "%{count} notities" zero: geen notities notes: Notities - not_available_abbr: n/b numbered_step: Stap %{number} ok: Ok optional: optioneel @@ -144,13 +145,11 @@ nl: show_all: Toon alle sort: alphabetically: Alfabetisch - alphabetically_confirm: Weet u zeker dat u deze projecten alfabetisch wilt sorteren? - Dat zal de huidige sorteervolgorde aanpassen. + alphabetically_confirm: Weet u zeker dat u deze projecten alfabetisch wilt sorteren? Dat zal de huidige sorteervolgorde aanpassen. alphabetically_title: Sorteer projecten alfabetisch by_task_count: Op aantal acties by_task_count_title: Sorteer op aantal acties - by_task_count_title_confirm: Weet u zeker dat u deze op aantal acties wilt sorteren? - Dat zal de huidige sorteervolgorde aanpassen. + by_task_count_title_confirm: Weet u zeker dat u deze op aantal acties wilt sorteren? Dat zal de huidige sorteervolgorde aanpassen. sort: Sorteer third: Derde todo: actie @@ -168,8 +167,7 @@ nl: context_name: Context naam context_state: Status delete_context: Verwijder context - delete_context_confirmation: Weet u zeker dat u de context '%{name}' wilt verwijderen? - Merk op dat dit ook alle (herhalende) acties in deze context zal verwijderen! + delete_context_confirmation: Weet u zeker dat u de context '%{name}' wilt verwijderen? Merk op dat dit ook alle (herhalende) acties in deze context zal verwijderen! delete_context_title: Verwijder context edit_context: Bewerk context hidden_contexts: Verborgen contexten @@ -178,6 +176,7 @@ nl: last_completed_in_context: in deze context (laatste %{number}) new_context_post: "' zal ook gemaakt worden. Weet u dit zeker?" new_context_pre: Nieuwe context ' + no_contexts_: 'No contexts ' no_contexts_active: Momenteel zijn er geen actieve contexten no_contexts_closed: Momenteel zijn er geen gesloten contexten no_contexts_hidden: Momenteel zijn er geen verborgen contexten @@ -193,6 +192,7 @@ nl: import_destination_invalid: Verkeerde bestemming voor import import_errors: Er hebben zich fouten voorgedaan bij de import import_successful: De import was succesvol + invalid_import_destination: Invalid import destination date: abbr_day_names: - Zo @@ -310,8 +310,8 @@ nl: invalid: is niet geldig less_than: moet minder zijn dan %{count} less_than_or_equal_to: moet minder of gelijk zijn aan %{count} - not_an_integer: moet een geheel getal zijn not_a_number: is geen getal + not_an_integer: moet een geheel getal zijn odd: moet oneven zijn other_than: moet anders zijn dan %{count} present: moet leeg zijn @@ -319,8 +319,7 @@ 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) - user_unauthorized: '401 Unauthorized: Alleen administratieve gebruikers mogen - deze functie gebruiken.' + user_unauthorized: '401 Unauthorized: Alleen administratieve gebruikers mogen deze functie gebruiken.' feedlist: actions_completed_last_week: Acties afgerond in de afgelopen 7 dagen actions_due_next_week: Acties die binnen 7 dagen afgerond moeten @@ -333,18 +332,15 @@ nl: choose_context: Kies de context waar je een feed van wilt choose_project: Kies het project waar je een feed van wilt context_centric_actions: Feeds voor onafgeronde acties in een specifieke context - context_needed: Er moet eerst ten minste één context zijn voor je een feed kan - opvragen + context_needed: Er moet eerst ten minste één context zijn voor je een feed kan opvragen ical_feed: iCal feed last_fixed_number: Laatste %{number} acties legend: Legenda - notice_incomplete_only: 'Merk op: alle feeds laten alleen acties zien die niet - afgerond zijn, tenzij anders vermeld.' + notice_incomplete_only: 'Merk op: alle feeds laten alleen acties zien die niet afgerond zijn, tenzij anders vermeld.' plain_text_feed: Reguliere tekst feed - projects_and_actions: Actieve projecten met hun acties project_centric: Feeds voor onafgeronde acties in een specifiek project - project_needed: Er moet ten minste één project zijn voor een feed opgevraagd kan - worden + project_needed: Er moet ten minste één project zijn voor een feed opgevraagd kan worden + projects_and_actions: Actieve projecten met hun acties rss_feed: RSS Feed select_feed_for_context: Kies de feed voor deze context select_feed_for_project: Kies de feed voor dit project @@ -361,6 +357,7 @@ nl: opensearch_description: Zoek in Tracks layouts: mobile_navigation: + calendar: Calendar contexts: Contexten feeds: Feeds full: Volledige site @@ -386,6 +383,7 @@ nl: group_view_by_project: Groepeer op project group_view_by_title: Verander de groepering van de acties op deze pagina help: "?" + help_page: Help home: Start home_title: Start import: import @@ -395,6 +393,7 @@ nl: manage_users_title: Toevoegen of verwijderen gebruikers mobile: Mobiele site notes_title: Toon alle notities + options: Options organize: Organiseer preferences: Voorkeuren preferences_title: Toon mijn voorkeuren @@ -425,22 +424,21 @@ nl: cas_login: CAS Inloggen cas_no_user_found: Hallo,%{username}! Je hebt nog geen account op Tracks. cas_signup_link: Aanvragen account - cas_username_not_found: Sorry, geen gebruiker met die CAS gebruikersnaam bestaat - (%{username}) + cas_username_not_found: Sorry, geen gebruiker met die CAS gebruikersnaam bestaat (%{username}) + log_in_again: opnieuw in te loggen. logged_out: Je bent afgemeld bij Tracks. login_cas: Ga naar het CAS login_standard: Ga terug naar de standaard login login_with_openid: inloggen met een OpenID - log_in_again: opnieuw in te loggen. mobile_use_openid: "... if inloggen met een OpenID" - openid_identity_url_not_found: Sorry, geen gebruiker met die identiteit URL bestaat - (%{identity_url}) + openid_identity_url_not_found: Sorry, geen gebruiker met die identiteit URL bestaat (%{identity_url}) option_separator: of, please_login: Log in om Tracks te gebruiken session_time_out: Sessie is verlopen. Gelieve %{link} session_will_expire: sessie zal verlopen na %{hours} u(u)r(en) van inactiviteit. session_will_not_expire: sessie zal niet verlopen. sign_in: Meld aan + signup_prompt: Want to create an account? successful: Succesvol aangemeld. Welkom terug! successful_with_session_info: 'Login succesvol:' unsuccessful: Login mislukt. @@ -452,29 +450,29 @@ nl: due_styles: - Deadline over ____ dagen - Deadline op ____ + themes: + black: Black + light_blue: Light blue project: feed_description: Een overzicht van alle projecten voor %{username} feed_title: Tracks Projecten todo: error_date_must_be_future: moet een datum in de toekomst zijn user: - error_context_not_associated: Context %{context} niet geassocieerd met gebruikers - %{user}. - error_project_not_associated: Project %{project} niet geassocieerd met gebruikers - %{user}. + error_context_not_associated: Context %{context} niet geassocieerd met gebruikers %{user}. + error_project_not_associated: Project %{project} niet geassocieerd met gebruikers %{user}. notes: - deleted_note: Verwijder notitie '%{id}' delete_confirmation: Weet u zeker dat u de notitie '%{id}' wilt verwijderen? delete_item_title: Verwijder item delete_note_confirm: Weet u zeker dat u de notitie '%{id}' wilt verwijderen? delete_note_title: Verwijder de notitie '%{id}' + deleted_note: Verwijder notitie '%{id}' edit_item_title: Item bewerken in_project: 'In:' + no_notes_available: 'Momenteel zijn er geen notities: voeg notities toe aan projecten vanaf de individuele project pagina''s.' note_header: Notitie %{id} note_link_title: Toon notitie %{id} note_location_link: 'In:' - no_notes_available: 'Momenteel zijn er geen notities: voeg notities toe aan projecten - vanaf de individuele project pagina''s.' save_status_message: Notitie %{id} bewaard show_note_title: Toon notitie number: @@ -502,6 +500,7 @@ nl: quadrillion: Quadriljoen thousand: Duizend trillion: Triljoen + unit: "." format: delimiter: "." precision: 1 @@ -519,7 +518,11 @@ nl: tb: TB percentage: format: + delimiter: Delimiter format: "%n%" + precision: + format: + delimiter: Delimiter preferences: authentication_header: Uw authenticatie change_authentication_type: Verander uw authenticatietype @@ -528,15 +531,14 @@ nl: current_authentication_type: Uw authenticatietype is %{auth_type} edit_preferences: Voorkeuren bewerken generate_new_token: Genereer een nieuwe token - generate_new_token_confirm: Weet u dit zeker? Het genereren van een nieuw token - zal de bestaande te vervangen en dit zal het extern gebruiken van de oude token - laten mislukken. + generate_new_token_confirm: Weet u dit zeker? Het genereren van een nieuw token zal de bestaande te vervangen en dit zal het extern gebruiken van de oude token laten mislukken. is_false: Nee is_true: Ja open_id_url: Uw OpenID URL is page_title: 'TRACKS:: Voorkeuren' page_title_edit: 'TRACKS:: Voorkeuren bewerken' password_changed: Je wachtwoord is gewijzigd, meld je opnieuw aan. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. show_number_completed: Toon %{number} voltooide items sms_context_none: Geen staleness_starts_after: Markeren openstaande acties begint na %{days} dagen @@ -544,6 +546,7 @@ nl: authentication: Authenticatie date_and_time: Datum en tijd profile: Profiel + remove_account: Remove account tracks_behavior: Tracks gedrag title: Uw voorkeuren token_description: Token (voor feeds en API gebruik) @@ -555,17 +558,19 @@ nl: add_note: Een notitie toevoegen add_note_submit: Notitie toevoegen add_project: Voeg project toe - all_completed_tasks_title: TRACKS::Overzicht van all afgeronde acties in project - '%{project_name}' + all_completed_tasks_title: TRACKS::Overzicht van all afgeronde acties in project '%{project_name}' + completed_actions: Completed actions + completed_actions_empty: Completed actions empty completed_projects: Voltooide projecten completed_tasks_title: TRACKS::Toon afgeronde acties in het project '%{project_name}' default_context: De standaard context voor dit project is %{context} default_context_removed: Standaard context verwijderd default_context_set: Stel project standaard context in op %{default_context} default_tags_removed_notice: De standaard tags zijn verwijderd + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty delete_project: Project verwijderen - delete_project_confirmation: Weet u zeker dat u wilt het project '%{name} wilt - verwijderen? + delete_project_confirmation: Weet u zeker dat u wilt het project '%{name} wilt verwijderen? delete_project_title: Verwijder het project edit_project_settings: Bewerk project instellingen edit_project_title: Bewerk project @@ -577,19 +582,19 @@ nl: list_completed_projects: TRACKS::Toon afgeronde projecten list_projects: 'TRACKS:: Overzicht van projecten' list_reviews: TRACKS::Evaluatie - notes: Notities - notes_empty: Er zijn geen notities voor dit project no_default_context: Dit project heeft geen standaard context no_last_completed_projects: Geen afgeronde projecten gevonden no_last_completed_recurring_todos: Geen afgeronde herhalende acties gevonden no_notes_attached: Momenteel zijn er geen notities toegevoegd aan dit project no_projects: Momenteel zijn er geen projecten + notes: Notities + notes_empty: Er zijn geen notities voor dit project page_title: 'TRACKS:: Project: %{project}' project_destroyed_status: Project '%{name}' verwijderd project_saved_status: Project opgeslagen project_state: Project is %{state}. - settings: Instellingen set_default_tags_notice: Stel project standaard tags in op %{default_tags} + settings: Instellingen show_form: Toevoegen van een project show_form_title: Maak een nieuw project state: Dit project is %{state} @@ -604,8 +609,8 @@ nl: with_no_default_tags: en zonder standaard tags search: contexts_matching_query: Contexten passend bij zoekopdracht - notes_matching_query: Notities passend bij zoekopdracht no_results: Uw zoekopdracht heeft geen resultaten opgeleverd. + notes_matching_query: Notities passend bij zoekopdracht projects_matching_query: Projecten passend bij zoekopdracht tags_matching_query: Tags passend bij zoekopdracht todos_matching_query: Todos passend bij zoekopdracht @@ -642,6 +647,7 @@ nl: completed: Afgerond completed_plural: Afgeronde contexts: + ":": ":" active: Actieve contexten closed: Gesloten contexten hidden: Verborgen contexten @@ -650,6 +656,7 @@ nl: hidden: Verborgen hidden_plural: Verborgen projects: + ":": ":" active: Actieve projecten blocked: Geblokkeerd closed: Gesloten projecten @@ -665,17 +672,15 @@ nl: visible: Zichtbaar visible_plural: Zichtbare stats: + action_completion_time_title: Doorlooptijd (alle voltooide acties) + action_selection_title: 'TRACKS:: Actie selectie' actions: Acties actions_30days_title: Acties in de afgelopen 30 dagen - actions_actions_avg_created_30days: In de afgelopen 30 dagen heeft u gemiddeld - %{count} acties gemaakt + actions_actions_avg_created_30days: In de afgelopen 30 dagen heeft u gemiddeld %{count} acties gemaakt actions_avg_completed: en voltooide een gemiddelde van %{count} acties per maand. - actions_avg_completed_30days: en voltooide een gemiddelde van %{count} acties - per dag. - actions_avg_completion_time: Van al uw afgeronde acties, de gemiddelde tijd dat - dit in beslag nam is %{count} dagen. - actions_avg_created: In de afgelopen 12 maanden heeft u gemiddeld%{count} acties - aangemaakt + actions_avg_completed_30days: en voltooide een gemiddelde van %{count} acties per dag. + actions_avg_completion_time: Van al uw afgeronde acties, de gemiddelde tijd dat dit in beslag nam is %{count} dagen. + actions_avg_created: In de afgelopen 12 maanden heeft u gemiddeld%{count} acties aangemaakt actions_day_of_week_legend: day_of_week: Dag van de week number_of_actions: Aantal acties @@ -685,25 +690,20 @@ nl: number_of_actions: Aantal acties actions_dow_30days_title: Dag van de week (laatste 30 dagen) actions_further: en verder - actions_lastyear_title: Acties in de afgelopen 12 maanden actions_last_year: Acties in de afgelopen jaren actions_last_year_legend: months_ago: Maanden geleden number_of_actions: Aantal acties + actions_lastyear_title: Acties in de afgelopen 12 maanden actions_min_completion_time: De minimale tijd tot afronding is %{time}. actions_min_max_completion_days: De min-/maximum dagen tot voltooiing is %{min}/%{max}. actions_selected_from_week: Gekozen acties van week - action_completion_time_title: Doorlooptijd (alle voltooide acties) - action_selection_title: 'TRACKS:: Actie selectie' click_to_return: Klik %{link} om terug te keren naar de statistieken pagina. click_to_return_link: hier - click_to_show_actions_from_week: Klik %{link} om de acties van week %{week} en - verder te zien. - click_to_update_actions: Klik op een balk in de grafiek op de acties hieronder - aan te passen. + click_to_show_actions_from_week: Klik %{link} om de acties van week %{week} en verder te zien. + click_to_update_actions: Klik op een balk in de grafiek op de acties hieronder aan te passen. contexts: Contexten - current_running_time_of_incomplete_visible_actions: Huidige looptijd van onvolledige - zichtbare acties + current_running_time_of_incomplete_visible_actions: Huidige looptijd van onvolledige zichtbare acties index_title: TRACKS::Statistiek labels: avg_completed: Gem afgerond @@ -720,8 +720,7 @@ nl: number_of_days: Aantal dagen geleden percentage: Percentage running_time: Looptijd van een actie (weken) - more_stats_will_appear: Meer statistieken zullen hier verschijnen zodra u acties - hebt toegevoegd. + more_stats_will_appear: Meer statistieken zullen hier verschijnen zodra u acties hebt toegevoegd. no_actions_selected: Er zijn geen acties geselecteerd. no_tags_available: geen tags beschikbaar open_per_week: Active (zichtbare en verborgen) volgende acties per week @@ -740,15 +739,12 @@ nl: percentage: Percentage weeks: Looptijd van een actie (weken). Klik op een balk voor meer info spread_of_actions_for_all_context: Verdeling van acties voor alle contexten - spread_of_running_actions_for_visible_contexts: Verdeling van actieve acties voor - zichtbare contexten - tags: Tags - tag_cloud_90days_description: Deze tag cloud bevat tags van acties die zijn gemaakt - of voltooid in de afgelopen 90 dagen. + spread_of_running_actions_for_visible_contexts: Verdeling van actieve acties voor zichtbare contexten + tag_cloud_90days_description: Deze tag cloud bevat tags van acties die zijn gemaakt of voltooid in de afgelopen 90 dagen. tag_cloud_90days_title: Tag cloud met acties in afgelopen 90 dagen - tag_cloud_description: Deze tag cloud bevat tags van alle acties (afgerond, niet - voltooid, zichtbaar en / of verborgen) + tag_cloud_description: Deze tag cloud bevat tags van alle acties (afgerond, niet voltooid, zichtbaar en / of verborgen) tag_cloud_title: Tag Cloud voor alle acties + tags: Tags time_of_day: Tijd van de dag (alle acties) time_of_day_legend: number_of_actions: Aantal acties @@ -761,11 +757,10 @@ nl: top10_projects: Top 10 projecten top10_projects_30days: Top 10 project in de laatste 30 dagen top5_contexts: Top 5 contexten - top5_visible_contexts_with_incomplete_actions: Top 5 zichtbare contexten met onvolledige - acties + top5_visible_contexts_with_incomplete_actions: Top 5 zichtbare contexten met onvolledige acties totals: Totalen - totals_actions_completed: "%{count} van deze zijn voltooid." totals_action_count: u heeft een totaal van %{count} acties + 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_completed_project_count: en %{count} zijn afgeronde projecten. @@ -798,6 +793,14 @@ nl: 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_marked_complete: De actie '%{description}' werd gemarkeerd als %{completed} + action_marked_complete_error: De actie '%{description}' is niet gemarkeerd als %{completed} vanwege een fout op de server. + action_saved: Actie opgeslagen + action_saved_to_tickler: Actie opgeslagen in tickler actions: completed: Afgeronde acties context_completed: Gesloten acties in deze context @@ -811,24 +814,14 @@ nl: tag_completed: Afgeronde acties getagged met '%{param}' tag_deferred_pending: Uitgestelde/wachtende acties getagged met '%{param}' tag_hidden: Verborgen acties getagged met '%{param}' - 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_marked_complete: De actie '%{description}' werd gemarkeerd - als %{completed} - action_marked_complete_error: De actie '%{description}' is niet - gemarkeerd als %{completed} vanwege een fout op de server. - action_saved: Actie opgeslagen - 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_new_context: Nieuwe context toegevoegd added_new_next_action: Nieuwe actie toegevoegd added_new_next_action_plural: Nieuwe acties toegevoegd added_new_next_action_singular: Nieuwe actie toegevoegd added_new_project: Nieuw project toegevoegd - add_another_dependency: Nog een afhankelijkheid toevoegen - add_new_recurring: Voeg een nieuwe terugkerende actie toe all_completed: Alle afgeronde acties all_completed_here: hier all_completed_tagged_page_title: 'TRACKS:: Alle afgeronde acties met tag %{tag_name}' @@ -843,20 +836,20 @@ nl: due_today: Deadline vandaag get_in_ical_format: Ontvang deze agenda in iCal-formaat calendar_page_title: TRACKS::Agenda - cannot_add_dependency_to_completed_todo: Kan deze actie niet als een afhankelijkheid - van een voltooide actie toevoegen! + cannot_add_dependency_to_completed_todo: Kan deze actie niet als een afhankelijkheid van een voltooide actie toevoegen! clear_due_date: Maak deadline leeg clear_show_from_date: Maak de datum Tonen Vanaf leeg completed: Afgerond + completed_actions: Completed actions completed_actions_with: Afgeronde acties met de tag %{tag_name} completed_in_archive: one: Er is een voltooide actie in het archief. other: Er zijn %{count} afgeronde acties in het archief. completed_last_day: Voltooid in de laatste 24 uur completed_last_x_days: Voltooid in de laatste %{count} dagen - completed_recurrence_completed: Er is geen actie na de terugkerende actie die - u new verwijderd heeft. De herhaling is voltooid + completed_recurrence_completed: Er is geen actie na de terugkerende actie die u new verwijderd heeft. De herhaling is voltooid completed_recurring: Afgesloten terugkerende todos + completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Afgerond in de rest van deze maand completed_rest_of_previous_month: Afgerond in de rest van de vorige maand completed_rest_of_week: Afgerond in de rest van deze week @@ -866,25 +859,22 @@ nl: confirm_delete: Weet u zeker dat u de actie '%{description}' wilt verwijderen? context_changed: Context veranderd in '%{name}' convert_to_project: Maak project - deferred_actions_with: Uitgestelde acties met de tag '%{tag_name}' - deferred_pending_actions: Uitgestelde/wachtende acties - deferred_tasks_title: TRACKS::Tickler - defer_date_after_due_date: Uitsteldatum is na de vervaldag. Gelieve vervaldag - bewerken alvorens uitsteldatum aan te passen. + defer_date_after_due_date: Uitsteldatum is na de vervaldag. Gelieve vervaldag bewerken alvorens uitsteldatum aan te passen. defer_x_days: one: Een dag 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 delete: Verwijder - deleted_success: De actie werd met succes verwijderd. delete_action: Verwijder actie - delete_recurring_action_confirm: Weet u zeker dat u wilt de terugkerende actie - '%{description}' wilt verwijderen? + delete_recurring_action_confirm: Weet u zeker dat u wilt de terugkerende actie '%{description}' wilt verwijderen? delete_recurring_action_title: Verwijder de terugkerende actie + deleted_success: De actie werd met succes verwijderd. depends_on: Hangt af van depends_on_separate_with_commas: Afhankelijk van (gescheiden door komma's) done: Voltooid? - drag_action_title: Sleep naar een andere actie om deze afhankelijk te maken van - die actie + drag_action_title: Sleep naar een andere actie om deze afhankelijk te maken van die actie due: Deadline edit: Bewerken edit_action: Actie bewerken @@ -893,25 +883,19 @@ nl: error: invalid_due_date: Ongeldige deadline datum invalid_show_from_date: Ongeldige datum voor tonen vanaf - error_completing_todo: Er was een fout bij het voltooien / activeren van de terugkerende - actie '%{description}' - error_deleting_item: Er is een fout opgetreden bij het verwijderen van het item - '%{description}' - error_deleting_recurring: Er is een fout opgetreden bij het verwijderen van het - item '%{description}' - error_removing_dependency: Er is een fout opgetreden het verwijderen van de afhankelijke - actie - error_saving_recurring: Er is een fout opgetreden het opslaan van de terugkerende - actie '%{description}' + error_completing_todo: Er was een fout bij het voltooien / activeren van de terugkerende actie '%{description}' + error_deleting_item: Er is een fout opgetreden bij het verwijderen van het item '%{description}' + error_deleting_recurring: Er is een fout opgetreden bij het verwijderen van het item '%{description}' + error_removing_dependency: Er is een fout opgetreden het verwijderen van de afhankelijke actie + error_saving_recurring: Er is een fout opgetreden het opslaan van de terugkerende actie '%{description}' error_starring: Kon niet de ster van deze actie niet omzetten '%{description}' - error_starring_recurring: Kon niet de ster van deze terugkerende actie niet omzetten - '%{description}' + error_starring_recurring: Kon niet de ster van deze terugkerende actie niet omzetten '%{description}' error_toggle_complete: Kon deze actie niet als afgerond markeren + feed_title_in_context: in context '%{context}' + feed_title_in_project: In het project '%{project}' feeds: completed: 'Voltooid: %{date}' due: 'Deadline: %{date}' - feed_title_in_context: in context '%{context}' - feed_title_in_project: In het project '%{project}' has_x_pending: one: Heeft een wachtende actie other: Heeft %{count} wachtende acties @@ -919,14 +903,14 @@ nl: in_hidden_state: in verborgen toestand in_pending_state: in wachtende toestand list_incomplete_next_actions: Toon onvoltooide acties - list_incomplete_next_actions_with_limit: Toont de laatste %{count} onvoltooide - acties + list_incomplete_next_actions_with_limit: Toont de laatste %{count} onvoltooide acties mark_complete: Markeer gereed mobile_todos_page_title: Alle acties - new_related_todo_created: Een nieuwe actie is toegevoegd, die behoort bij deze - terugkerende todo + new_related_todo_created: Een nieuwe actie is toegevoegd, die behoort bij deze terugkerende todo new_related_todo_created_short: een nieuwe actie gemaakt new_related_todo_not_created_short: een nieuwe actie is niet gemaakt + next_action_description: Actie beschrijving + next_action_needed: U dient ten minste een actie in te vullen next_actions_description: 'Filter:' next_actions_description_additions: completed: in de afgelopen %{count} dagen @@ -942,8 +926,6 @@ nl: completed: acties voltooid due_today: deadline vandaag due_within_a_week: deadline binnen een week - next_action_description: Actie beschrijving - next_action_needed: U dient ten minste een actie in te vullen no_actions: completed: Momenteel zijn er geen afgeronde acties completed_recurring: Momenteel zijn er geen afgeronden herhalende acties @@ -968,8 +950,17 @@ nl: title: Geen acties gevonden without_project: Momenteel zijn er geen acties zonder project no_actions_due_this_week: Geen acties met deadline in rest van deze week + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with no_last_completed_actions: Geen afgeronde acties gevonden no_project: "-- Geen project --" + no_recurring_todos: No recurring todos + notes: Notes overdue: Achterstallig pending: Wachtend recurrence: @@ -1041,21 +1032,19 @@ nl: weekly_every_number_week: Herhaalt elke %{number} weken op weekly_options: Instellingen voor de wekelijkse terugkerende acties yearly: Jaarlijks - yearly_every_xth_day: De %{day} %{day_of_week} van %{month} yearly_every_x_day: Elke %{month} %{day} + yearly_every_xth_day: De %{day} %{day_of_week} van %{month} yearly_options: Instellingen voor jaarlijks terugkerende acties - recurrence_completed: Er is geen volgende actie na de terugkerende actie die u - zojuist hebt voltooid. De herhaling is voltooid + recurrence_completed: Er is geen volgende actie na de terugkerende actie die u zojuist hebt voltooid. De herhaling is voltooid recurrence_period: Herhaling periode - recurring_actions_title: TRACKS::Terugkerende acties - recurring_action_deleted: Actie werd verwijderd. Omdat deze actie herhalend is. - werd een nieuwe actie toegevoegd + recurring_action_deleted: Actie werd verwijderd. Omdat deze actie herhalend is. werd een nieuwe actie toegevoegd recurring_action_saved: Terugkerende actie opgeslagen + recurring_actions_title: TRACKS::Terugkerende acties recurring_deleted_success: De recurrente actie is succesvol verwijderd. recurring_pattern_removed: Het herhalingspatroon is verwijderd van %{count} recurring_todos: Terugkerende acties - removed_predecessor: "'%{successor}' is verwijderd als afhankelijkheid van '%{predecessor}'." remove_dependency: Verwijder afhankelijkheid (zal niet de actie zelf verwijderen) + 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" @@ -1072,36 +1061,30 @@ 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 - veld is niet herleidbaar naar een bestaande actie. Deze waarde wordt niet bewaard - met de rest van de actie. Doorgaan? + unresolved_dependency: De waarde die u ingevoerd heeft in het afhankelijkheden veld is niet herleidbaar naar een bestaande actie. Deze waarde wordt niet bewaard met de rest van de actie. Doorgaan? was_due_on_date: had deadline op %{date} users: account_signup: Aanmelden voor een account + approve_tos: I approve the Terms of Service auth_change_submit: Wijzigen authenticatietype + auth_type_update_error: 'Er was een probleem met het bijwerken van uw authenticatietype: %{error_messages}' auth_type_updated: Authenticatietype bijgewerkt. - auth_type_update_error: 'Er was een probleem met het bijwerken van uw authenticatietype: - %{error_messages}' - change_authentication_type: Wijzigen authenticatietype change_auth_type_title: TRACKS::Wijzig authenticatietype - change_password_prompt: Voer uw nieuwe wachtwoord in de onderstaande velden in - en kies 'Wachtwoord wijzigen' om uw huidige wachtwoord met uw nieuwe te vervangen. + change_authentication_type: Wijzigen authenticatietype + change_password_prompt: Voer uw nieuwe wachtwoord in de onderstaande velden in en kies 'Wachtwoord wijzigen' om uw huidige wachtwoord met uw nieuwe te vervangen. change_password_submit: Wachtwoord wijzigen change_password_title: TRACKS::Wachtwoord wijzigen choose_password: Kies een wachtwoord confirm_password: Bevestig wachtwoord desired_login: Gewenste login - destroy_confirmation: 'Waarschuwing: dit zal de gebruiker ''%{login} verwijderen - met al zijn acties, contexten, projecten en notities. Weet u zeker dat u wilt - doorgaan?' - destroy_error: Er is een fout opgetreden bij het verwijderen van de gebruiker - '%{login}' + destroy_confirmation: 'Waarschuwing: dit zal de gebruiker ''%{login} verwijderen met al zijn acties, contexten, projecten en notities. Weet u zeker dat u wilt doorgaan?' + destroy_error: Er is een fout opgetreden bij het verwijderen van de gebruiker '%{login}' destroy_successful: Gebruiker %{login} met succes verwijderd destroy_user: Verwijder de gebruiker + email_address: Email address failed_to_delete_user: Mislukt de gebruiker %{username} te verwijderen first_user_heading: 'Welkom bij TRACKS. Om te beginnen, maak dan een admin account:' first_user_title: TRACKS::Aanmelden als de beheerder @@ -1113,19 +1096,17 @@ nl: new_user_heading: 'Registreer een nieuwe gebruiker:' new_user_title: 'TRACKS:: Aanmelden als de admin gebruiker' no_signups_title: 'TRACKS:: Geen nieuwe aanmeldingen' - openid_ok_pref_failed: Je hebt succesvol de %{url} geverifieerd als je identiteit, - maar er was een probleem met het opslaan van uw authenticatie voorkeuren. - openid_url_verified: Je hebt %{url} met succes geverifieerd als je identiteit - en uw authenticatie type OpenID opgeslagen. + openid_ok_pref_failed: Je hebt succesvol de %{url} geverifieerd als je identiteit, maar er was een probleem met het opslaan van uw authenticatie voorkeuren. + openid_url_verified: Je hebt %{url} met succes geverifieerd als je identiteit en uw authenticatie type OpenID opgeslagen. password_confirmation_label: Bevestig wachtwoord password_updated: Wachtwoord bijgewerkt. register_with_cas: Met uw CAS gebruikersnaam - select_authentication_type: Selecteer uw nieuwe authenticatie type en klik op - 'Wijzigen authenticatietype' om uw huidige instellingen te vervangen. + select_authentication_type: Selecteer uw nieuwe authenticatie type en klik op 'Wijzigen authenticatietype' om uw huidige instellingen te vervangen. signup: Aanmelden signup_new_user: Registreer nieuwe gebruiker signup_successful: Aanmelding succesvol voor gebruiker %{username}. successfully_deleted_user: Succesvol gebruiker %{username} verwijderd + tos_link: read the Terms of Service total_actions: Totaal aanal acties total_contexts: Totaal aantal contexten total_notes: Totaal aantal notities @@ -1137,8 +1118,7 @@ nl: next_label: Volgende » page_entries_info: multi_page: Toon %{model} %{from} - %{to} van %{count} in totaal - multi_page_html: Toon %{model} %{from} - %{to} van %{count} - in totaal + multi_page_html: Toon %{model} %{from} - %{to} van %{count} in totaal single_page: one: Toon 1 %{model} other: Toon alle %{count} %{model} diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 6a9265d5..816c99f4 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -3,232 +3,230 @@ ru: activerecord: attributes: note: - created_at: "Создано" - updated_at: "Обновлено" + created_at: Создано + updated_at: Обновлено preference: - date_format: "Формат даты" - due_style: "Стиль даты 'Выполнить к'" - first_name: "Имя" - last_name: "Фамилия" - locale: "Язык" - mobile_todos_per_page: "Действий на страницу (мобильная версия)" - refresh: "период обновления (в минутах)" - review_period: "Период обзора проектов" - show_completed_projects_in_sidebar: "Отображать выполненные проекты в боковой - панели" - show_hidden_contexts_in_sidebar: "Отображать скрытые контексты в боковой панели" - show_hidden_projects_in_sidebar: "Отображать скрытые проекты в боковой панели" - show_number_completed: "Показывать количество выполненных действий" - show_project_on_todo_done: "Переходить на страницу проекта при выполнении - задачи" - sms_context: "Контекст email по-умолчанию" - sms_email: "Отправитель email" - staleness_starts: "Начало устаревания" - time_zone: "Часовой пояс" - title_date_format: "Формат даты в заголовке" - verbose_action_descriptors: "Подробные описания действий" - week_starts: "Неделя начинается с" + date_format: Формат даты + due_style: Стиль даты 'Выполнить к' + first_name: Имя + last_name: Фамилия + locale: Язык + mobile_todos_per_page: Действий на страницу (мобильная версия) + refresh: период обновления (в минутах) + review_period: Период обзора проектов + show_completed_projects_in_sidebar: Отображать выполненные проекты в боковой панели + show_hidden_contexts_in_sidebar: Отображать скрытые контексты в боковой панели + show_hidden_projects_in_sidebar: Отображать скрытые проекты в боковой панели + show_number_completed: Показывать количество выполненных действий + show_project_on_todo_done: Переходить на страницу проекта при выполнении задачи + sms_context: Контекст email по-умолчанию + sms_email: Отправитель email + staleness_starts: Начало устаревания + time_zone: Часовой пояс + title_date_format: Формат даты в заголовке + verbose_action_descriptors: Подробные описания действий + week_starts: Неделя начинается с project: - default_context_name: "Контекст по-умолчанию" - default_tags: "Метки по-умолчанию" - description: "Описание" - name: "Наменование" + default_context_name: Контекст по-умолчанию + default_tags: Метки по-умолчанию + description: Описание + name: Наменование todo: - context: "Контекст" - description: "Описание" - due: "Выполнить к" - notes: "Заметки" - predecessors: "Зависит от" - project: "Проект" - show_from: "Показывать c" - tags: "Метки" + context: Контекст + description: Описание + due: Выполнить к + notes: Заметки + predecessors: Зависит от + project: Проект + show_from: Показывать c + tags: Метки user: - auth_type: "Тип авторизации" - display_name: "Отображаемое имя" - first_name: "Имя" - last_name: "Фамилия" - login: "Пользователь" + auth_type: Тип авторизации + display_name: Отображаемое имя + email: Email address + first_name: Имя + last_name: Фамилия + login: Пользователь open_id_url: Open ID идентификатор - password: "Пароль" + password: Пароль errors: full_messages: format: "%{attribute} %{message}" messages: - accepted: "должно быть подтверждено" - blank: "не может быть пустым" - confirmation: "не совпадает с подтверждением" - empty: "не может быть пустым" - equal_to: "должно быть равно %{count}" - even: "должно быть четным" - exclusion: "занято" - greater_than: "должно быть больше %{count}" - greater_than_or_equal_to: "должно быть больше либо равно %{count}" - inclusion: "не входит в список" - invalid: "не может содержать символ запятой (',')" - less_than: "должно быть меньше %{count}" - less_than_or_equal_to: "должно быть меньше или равно %{count}" - not_a_number: "не является числом" - odd: "должно быть нечетным" - record_invalid: "Проверка не пройдена: %{errors}" + accepted: должно быть подтверждено + blank: не может быть пустым + confirmation: не совпадает с подтверждением + empty: не может быть пустым + equal_to: должно быть равно %{count} + even: должно быть четным + exclusion: занято + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше либо равно %{count} + inclusion: не входит в список + invalid: не может содержать символ запятой (',') + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + odd: должно быть нечетным + record_invalid: 'Проверка не пройдена: %{errors}' restrict_dependent_destroy: - one: "Невозможно удалить запись, так как есть %{record} зависящая от нее" - many: "Невозможно удалить запись, так как есть %{record} зависящие от нее" - taken: "уже занято" - too_long: "слишком длинное (максимум %{count} символов)" - too_short: "слишком короткое (минимум %{count} символов)" - wrong_length: "неверной длины (должно быть %{count} символов)" + many: Невозможно удалить запись, так как есть %{record} зависящие от нее + one: Невозможно удалить запись, так как есть %{record} зависящая от нее + taken: уже занято + too_long: слишком длинное (максимум %{count} символов) + too_short: слишком короткое (минимум %{count} символов) + wrong_length: неверной длины (должно быть %{count} символов) models: project: attributes: name: - blank: "У проекта должно быть задано Имя" - taken: "уже существует" - too_long: "Имя проекта не более 256 символов" + blank: У проекта должно быть задано Имя + taken: уже существует + too_long: Имя проекта не более 256 символов template: - body: "Возникли проблемы при обработке полей:" + body: 'Возникли проблемы при обработке полей:' header: one: 1 ошибка мешает сохранению %{model} other: "%{count} ошибок мешают сохранению %{model}" common: - action: "Действие" - actions: "Действия" + action: Действие + actions: Действия actions_midsentence: - zero: "действий" - one: "действие" - few: "действия" - other: "действий" - add: "Добавить" - ajaxError: "От сервера была получена ошибка" - back: "Назад" - bugs: "Ошибки" - cancel: "Отмена" - collapse_expand: "Свернуть/развернуть" - context: "Контекст" - contexts: "Контексты" - contribute: "Сотрудничество" - create: "Создать" + few: действия + one: действие + other: действий + zero: действий + add: Добавить + ajaxError: От сервера была получена ошибка + back: Назад + bugs: Ошибки + cancel: Отмена + collapse_expand: Свернуть/развернуть + context: Контекст + contexts: Контексты + contribute: Сотрудничество + create: Создать days_midsentence: - zero: "дней" - one: "день" - few: "дня" - other: "дней" - deferred: "отложенные" - description: "Описание" - drag_handle: "ТАЩИТЬ" + few: дня + one: день + other: дней + zero: дней + deferred: отложенные + description: Описание + drag_handle: ТАЩИТЬ email: Email - errors_with_fields: "Возникли проблемы при обработке полей:" - first: "Первый" - forth: "Четвертый" - fourth: "Четвертый" - go_back: "Назад" - last: "Последние" - logout: "Выйти" - mailing_list: "Список рассылки" - month: "месяц" - months: "месяца" - next: "Следующая" - none: "Не задано" + errors_with_fields: 'Возникли проблемы при обработке полей:' + first: Первый + forth: Четвертый + fourth: Четвертый + go_back: Назад + last: Последние + logout: Выйти + mailing_list: Список рассылки + month: месяц + months: месяца + next: Следующая + none: Не задано + not_available_abbr: н/д note: - zero: "нет записей" - one: 1 запись few: "%{count} записи" + one: 1 запись other: "%{count} записей" - notes: "Заметки" - not_available_abbr: "н/д" - numbered_step: "Шаг %{number}" - ok: "ОК" - optional: "необязательно" - previous: "Предыдущая" - project: "Проект" - projects: "Проекты" - recurring_todos: "Регулярные задачи" - review: "Обзор" - search: "Поиск" - second: "Второй" - server_error: "Произошла ошибка на сервере." - show_all: "Показать все" + zero: нет записей + notes: Заметки + numbered_step: Шаг %{number} + ok: ОК + optional: необязательно + previous: Предыдущая + project: Проект + projects: Проекты + recurring_todos: Регулярные задачи + review: Обзор + search: Поиск + second: Второй + server_error: Произошла ошибка на сервере. + show_all: Показать все sort: - alphabetically: "По алфавиту" - alphabetically_confirm: "Вы уверены, что хотите сортировать проекты по алфавиту? - Это изменит текущий порядок сортировки." - alphabetically_title: "Сортировать проекты по алфавиту" - by_task_count: "По количеству задач" - by_task_count_title: "Сортировать по количеству задач" - by_task_count_title_confirm: "Вы уверены, что хотите сортировать проекты по - количеству задач? Это изменит текущий порядок сортировки." - sort: "Сортировать" - third: "Третий" - todo: "Задача" - update: "Обновить" - website: "Веб-сайт" - week: "неделя" - weeks: "недели" + alphabetically: По алфавиту + alphabetically_confirm: Вы уверены, что хотите сортировать проекты по алфавиту? Это изменит текущий порядок сортировки. + alphabetically_title: Сортировать проекты по алфавиту + by_task_count: По количеству задач + by_task_count_title: Сортировать по количеству задач + by_task_count_title_confirm: Вы уверены, что хотите сортировать проекты по количеству задач? Это изменит текущий порядок сортировки. + sort: Сортировать + third: Третий + todo: Задача + update: Обновить + website: Веб-сайт + week: неделя + weeks: недели wiki: Wiki contexts: - add_context: "Добавить контекст" + add_context: Добавить контекст all_completed_tasks_title: TRACKS::Все выполненные действия в контексте '%{context_name}' completed_tasks_title: TRACKS::Выполненные действия в контексте '%{context_name}' - context_deleted: "Удален контекст '%{name}'" - context_hide: "Скрыть с главной страницы?" - context_name: "Имя контекста" - context_state: "Состояние контекста" - delete_context: "Удалить контекст" - delete_context_confirmation: "Вы уверены, что хотите удалить контекст '%{name}'? - Это удалит также все действия (дублирующиеся) в этом контексте!" - delete_context_title: "Удалить контекст" - edit_context: "Изменить контекст" - hidden_contexts: "Скрытые контексты" - hide_form: "Скрыть форму" - hide_form_title: "Скрыть форму нового контекста" + context_deleted: Удален контекст '%{name}' + context_hide: Скрыть с главной страницы? + context_name: Имя контекста + context_state: Состояние контекста + delete_context: Удалить контекст + delete_context_confirmation: Вы уверены, что хотите удалить контекст '%{name}'? Это удалит также все действия (дублирующиеся) в этом контексте! + delete_context_title: Удалить контекст + edit_context: Изменить контекст + hidden_contexts: Скрытые контексты + hide_form: Скрыть форму + hide_form_title: Скрыть форму нового контекста last_completed_in_context: "(осталось %{number})" new_context_post: "' будет также создан. Вы уверены?" - new_context_pre: "Новый контекст '" - no_contexts_active: "На текущий момент нет активных контекстов" - no_contexts_closed: "На текущий момент нет закрытых контекстов" - no_contexts_hidden: "На текущий момент нет скрытых контекстов" - save_status_message: "Контекст сохранен" - show_form: "Создать новый контекст" - show_form_title: "Добавить контекст" - status_active: "Контекст активен" - status_hidden: "Контекст скрыт" - todos_append: "в этом контексте" - update_status_message: "Имя контекста было изменено" - visible_contexts: "Видимые контексты" + new_context_pre: Новый контекст ' + no_contexts_: 'No contexts ' + no_contexts_active: На текущий момент нет активных контекстов + no_contexts_closed: На текущий момент нет закрытых контекстов + no_contexts_hidden: На текущий момент нет скрытых контекстов + save_status_message: Контекст сохранен + show_form: Создать новый контекст + show_form_title: Добавить контекст + status_active: Контекст активен + status_hidden: Контекст скрыт + todos_append: в этом контексте + update_status_message: Имя контекста было изменено + visible_contexts: Видимые контексты data: - import_destination_invalid: "Неверный путь назначения для импорта" - import_errors: "При импорте произошли ошибки" - import_successful: "Импорт завершен." + import_destination_invalid: Неверный путь назначения для импорта + import_errors: При импорте произошли ошибки + import_successful: Импорт завершен. + invalid_import_destination: Invalid import destination date: abbr_day_names: - - "Вс" - - "Пн" - - "Вт" - - "Ср" - - "Чт" - - "Пт" - - "Сб" + - Вс + - Пн + - Вт + - Ср + - Чт + - Пт + - Сб abbr_month_names: - - - "Янв" - - "Фев" - - "Мар" - - "Апр" - - "Май" - - "Июн" - - "Июл" - - "Авг" - - "Сен" - - "Окт" - - "Ноя" - - "Дек" + - Янв + - Фев + - Мар + - Апр + - Май + - Июн + - Июл + - Авг + - Сен + - Окт + - Ноя + - Дек day_names: - - "воскресенье" - - "понедельник" - - "вторник" - - "среда" - - "четверг" - - "пятница" - - "суббота" + - воскресенье + - понедельник + - вторник + - среда + - четверг + - пятница + - суббота formats: default: "%Y-%m-%d" long: "%B %d, %Y" @@ -238,18 +236,18 @@ ru: short: "%b %d" month_names: - - - "января" - - "февраля" - - "марта" - - "апреля" - - "мая" - - "июня" - - "июля" - - "августа" - - "сентября" - - "октября" - - "ноября" - - "декабря" + - января + - февраля + - марта + - апреля + - мая + - июня + - июля + - августа + - сентября + - октября + - ноября + - декабря order: - :year - :month @@ -257,242 +255,240 @@ ru: datetime: distance_in_words: about_x_hours: - one: "около 1 часа" - few: "около %{count} часов" - other: "около %{count} часов" + few: около %{count} часов + one: около 1 часа + other: около %{count} часов about_x_months: - one: "около 1 месяца" - few: "около %{count} месяцев" - other: "около %{count} месяцев" + few: около %{count} месяцев + one: около 1 месяца + other: около %{count} месяцев about_x_years: - one: "около 1 года" - few: "около %{count} лет" - other: "около %{count} лет" + few: около %{count} лет + one: около 1 года + other: около %{count} лет almost_x_years: - one: "почти 1 год" - few: "почти %{count} года" - other: "почти %{count} лет" - half_a_minute: "пол минуты" + few: почти %{count} года + one: почти 1 год + other: почти %{count} лет + half_a_minute: пол минуты less_than_x_minutes: - one: "меньше минуты" - few: "меньше %{count} минут" - other: "меньше %{count} минут" - zero: "меньше минуты" + few: меньше %{count} минут + one: меньше минуты + other: меньше %{count} минут + zero: меньше минуты less_than_x_seconds: - one: "меньше 1 секунды" - few: "меньше %{count} секунд" - other: "меньше %{count} секунд" - zero: "меньше 1 секунды" + few: меньше %{count} секунд + one: меньше 1 секунды + other: меньше %{count} секунд + zero: меньше 1 секунды over_x_years: - one: "белее 1 года" - few: "более %{count} лет" - other: "более %{count} лет" + few: более %{count} лет + one: белее 1 года + other: более %{count} лет x_days: - one: 1 день few: "%{count} дня" + one: 1 день other: "%{count} дней" x_minutes: - one: 1 минута few: "%{count} минуты" + one: 1 минута other: "%{count} минут" x_months: - one: 1 месяц few: "%{count} месяца" + one: 1 месяц other: "%{count} месяцев" x_seconds: - one: 1 секунда few: "%{count} секунды" + one: 1 секунда other: "%{count} секунд" prompts: - day: "День" - hour: "Час" - minute: "Минута" - month: "Месяц" - second: "Секунда" - year: "Год" + day: День + hour: Час + minute: Минута + month: Месяц + second: Секунда + year: Год errors: format: "%{attribute} %{message}" messages: - accepted: "должен быть подтвержден" - blank: "должна быть заполнена" - confirmation: "не соответствует %{attribute}" - empty: "не может быть пустым" - equal_to: "должно равняться %{count}" - even: "должно быть четным" - exclusion: "зарезервированно" - greater_than: "должно быть больше %{count}" - greater_than_or_equal_to: "должно быть больше или равно %{count}" - inclusion: "не входит в список" - invalid: "неверное" - less_than: "должно быть меньше %{count}" - less_than_or_equal_to: "должно быть меньше или равно %{count}" - not_an_integer: "должно быть целым числом" - not_a_number: "не является числом" - odd: "должно быть нечетным" - other_than: "должно отличаться от %{count}" - present: "должно быть пустым" - taken: "уже занято" - too_long: "слишком длинное (максимум: %{count} символов)" - too_short: "слишком кроткое (минимум: %{count} символов)" - wrong_length: "неверной длины (должно быть %{count} символов)" - user_unauthorized: '401 Неавторизован: Только Администраторы имеют доступ к этой - функции.' + accepted: должен быть подтвержден + blank: должна быть заполнена + confirmation: не соответствует %{attribute} + empty: не может быть пустым + equal_to: должно равняться %{count} + even: должно быть четным + exclusion: зарезервированно + greater_than: должно быть больше %{count} + greater_than_or_equal_to: должно быть больше или равно %{count} + inclusion: не входит в список + invalid: неверное + less_than: должно быть меньше %{count} + less_than_or_equal_to: должно быть меньше или равно %{count} + not_a_number: не является числом + not_an_integer: должно быть целым числом + odd: должно быть нечетным + other_than: должно отличаться от %{count} + present: должно быть пустым + taken: уже занято + too_long: 'слишком длинное (максимум: %{count} символов)' + too_short: 'слишком кроткое (минимум: %{count} символов)' + wrong_length: неверной длины (должно быть %{count} символов) + user_unauthorized: '401 Неавторизован: Только Администраторы имеют доступ к этой функции.' feedlist: - actions_completed_last_week: "Действия завершенные за последние 7 дней" - actions_due_next_week: "Действия за 7 дней или ранее" - actions_due_today: "Действия за сегодня и ранее" - active_projects_wo_next: "Активные проекты без дальнейших действий" - active_starred_actions: "Все помеченные, активные действия" - all_actions: "Все действия" - all_contexts: "Все контексты" - all_projects: "Все проекты" - choose_context: "Выберите контекст для ленты новостей" - choose_project: "Выберите проект для ленты новостей" - context_centric_actions: "Лента для незавершенных действий в определенном контексте" - context_needed: "Должен быть выбран хотя бы один контекст, чтобы можно было запросить - ленту новостей" + actions_completed_last_week: Действия завершенные за последние 7 дней + actions_due_next_week: Действия за 7 дней или ранее + actions_due_today: Действия за сегодня и ранее + active_projects_wo_next: Активные проекты без дальнейших действий + active_starred_actions: Все помеченные, активные действия + all_actions: Все действия + all_contexts: Все контексты + all_projects: Все проекты + choose_context: Выберите контекст для ленты новостей + choose_project: Выберите проект для ленты новостей + context_centric_actions: Лента для незавершенных действий в определенном контексте + context_needed: Должен быть выбран хотя бы один контекст, чтобы можно было запросить ленту новостей ical_feed: iCal-лента - last_fixed_number: "Последние %{number} действий" - legend: "Легенда:" - notice_incomplete_only: "Внимание: Все ленты отображают только действия, которые - не помечены как выполеннные, и только незавершенные состояния. Данные iCal-ленты - могут быть добавлены в список задач. Если вы хотите отображать сроки выполнения - задач в календаре, используйте iCal-ленту на странице календаря." - plain_text_feed: "Лента в текстовом формате" - projects_and_actions: "Активные проекты и действия по ним" - project_centric: "Лента для незавершенных действий в определенном проекте" - project_needed: "Должен быть выбран хотя бы один проект, чтобы можно было запросить - ленту новостей" + last_fixed_number: Последние %{number} действий + legend: 'Легенда:' + notice_incomplete_only: 'Внимание: Все ленты отображают только действия, которые не помечены как выполеннные, и только незавершенные состояния. Данные iCal-ленты могут быть добавлены в список задач. Если вы хотите отображать сроки выполнения задач в календаре, используйте iCal-ленту на странице календаря.' + plain_text_feed: Лента в текстовом формате + project_centric: Лента для незавершенных действий в определенном проекте + project_needed: Должен быть выбран хотя бы один проект, чтобы можно было запросить ленту новостей + projects_and_actions: Активные проекты и действия по ним rss_feed: RSS-лента - select_feed_for_context: "Выберите ленту новостей для этого контекста" - select_feed_for_project: "Выберите ленту новостей для этого проекта" + select_feed_for_context: Выберите ленту новостей для этого контекста + select_feed_for_project: Выберите ленту новостей для этого проекта footer: - send_feedback: "Обратная связь. Версия %{version}" + send_feedback: Обратная связь. Версия %{version} helpers: select: - prompt: "Выберите" + prompt: Выберите submit: - create: "Создать %{model}" - submit: "Сохранить %{model}" - update: "Обновить %{model}" + create: Создать %{model} + submit: Сохранить %{model} + update: Обновить %{model} integrations: - opensearch_description: "Искать в Tracks" + opensearch_description: Искать в Tracks layouts: mobile_navigation: - contexts: "Контекст" - feeds: "Рассылка" - full: "Полная версия" - home: "Начало" - logout: "Выход" - new_action: "Новый" - projects: "Проекты" - starred: "Помеченные" - tickler: "Отложенные" + calendar: Calendar + contexts: Контекст + feeds: Рассылка + full: Полная версия + home: Начало + logout: Выход + new_action: Новый + projects: Проекты + starred: Помеченные + tickler: Отложенные navigation: - admin: "Администратор" - api_docs: "Документация REST API" - calendar: "Календарь" - calendar_title: "Календарь обязательных действий" - completed_tasks: "Сделано" - completed_tasks_title: "Выполненные" - contexts_title: "Просмотр контекстов" - export: "Экспорт" - export_title: "Экспорт данных" - feeds: "Ленты новостей" - feeds_title: "Отобразить список доступных лент" - group_view_by_context: "Группировать по контексту" - group_view_by_project: "Группировать по проекту" - group_view_by_title: "Изменить группировку действий на этой странице" + admin: Администратор + api_docs: Документация REST API + calendar: Календарь + calendar_title: Календарь обязательных действий + completed_tasks: Сделано + completed_tasks_title: Выполненные + contexts_title: Просмотр контекстов + export: Экспорт + export_title: Экспорт данных + feeds: Ленты новостей + feeds_title: Отобразить список доступных лент + group_view_by_context: Группировать по контексту + group_view_by_project: Группировать по проекту + group_view_by_title: Изменить группировку действий на этой странице help: "?" - home: "Начало" - home_title: "Начало" - import: "Импорт" - import_title: "Импорт данных" - integrations_: "Интеграция Tracks" - manage_users: "Управление пользователями" - manage_users_title: "Добавить или удалить пользователей" - mobile: "Мобильная версия" - notes_title: "Показать все заметки" - organize: "Организация" - preferences: "Настройки" - preferences_title: "Показать мои настройки" - projects_title: "Просмотр проектов" - recurring_todos: "Регулярные задачи" - recurring_todos_title: "Управление регулярными задачами" - review_title: "Обзор проектов" - search: "Искать все" - show_empty_containers_context: "Отобразить пустые контексты" - show_empty_containers_project: "Отобразить пустые проекты" - show_empty_containers_title: "Показать/скрыть пустые проекты или контексты" - starred: "Помеченные" - starred_title: "Отобразить помеченные действия" - stats: "Статистика" - stats_title: "Отобразить вашу статистику" - tickler: "Отложенные" - tickler_title: "Просмотр отложенных задач" - view: "Обзор" + help_page: Help + home: Начало + home_title: Начало + import: Импорт + import_title: Импорт данных + integrations_: Интеграция Tracks + manage_users: Управление пользователями + manage_users_title: Добавить или удалить пользователей + mobile: Мобильная версия + notes_title: Показать все заметки + options: Options + organize: Организация + preferences: Настройки + preferences_title: Показать мои настройки + projects_title: Просмотр проектов + recurring_todos: Регулярные задачи + recurring_todos_title: Управление регулярными задачами + review_title: Обзор проектов + search: Искать все + show_empty_containers_context: Отобразить пустые контексты + show_empty_containers_project: Отобразить пустые проекты + show_empty_containers_title: Показать/скрыть пустые проекты или контексты + starred: Помеченные + starred_title: Отобразить помеченные действия + stats: Статистика + stats_title: Отобразить вашу статистику + tickler: Отложенные + tickler_title: Просмотр отложенных задач + view: Обзор next_actions_rss_feed: RSS-лента следующих действий - toggle_contexts: "Видимость пересекающихся контекстов" - toggle_contexts_title: "Сделать пересекающиеся контексты (не)видимыми" - toggle_notes: "Видимость заметок" - toggle_notes_title: "Переключить видимость всех заметок" + toggle_contexts: Видимость пересекающихся контекстов + toggle_contexts_title: Сделать пересекающиеся контексты (не)видимыми + toggle_notes: Видимость заметок + toggle_notes_title: Переключить видимость всех заметок login: - account_login: "Обычный вход" - cas_create_account: "Если вы хотите послать запрос, перейдите на %{signup_link}" - cas_logged_in_greeting: "Привет, %{username}! Вы авторизованы." - cas_login: "Вход CAS" - cas_no_user_found: "Привет, %{username}! У Вас нет учетной записи на Tracks." - cas_signup_link: "Запросить авторизацию" - cas_username_not_found: "Извините, не существует пользователя для такого CAS (%{username})" - logged_out: "Вы вышли из Tracks." - login_cas: "перейти на CAS" - login_standard: "вернуться к обычному входу" - login_with_openid: "войти с помощью OpenID" - log_in_again: "войти снова." + account_login: Обычный вход + cas_create_account: Если вы хотите послать запрос, перейдите на %{signup_link} + cas_logged_in_greeting: Привет, %{username}! Вы авторизованы. + cas_login: Вход CAS + cas_no_user_found: Привет, %{username}! У Вас нет учетной записи на Tracks. + cas_signup_link: Запросить авторизацию + cas_username_not_found: Извините, не существует пользователя для такого CAS (%{username}) + log_in_again: войти снова. + logged_out: Вы вышли из Tracks. + login_cas: перейти на CAS + login_standard: вернуться к обычному входу + login_with_openid: войти с помощью OpenID mobile_use_openid: "… или войдите при помощи OpenID" - openid_identity_url_not_found: "Извините, пользователя с такой ссылкой URL не - существует (%{identity_url})" - option_separator: "или," - please_login: "Пожалуйста авторизуйтесь, чтобы использовать Tracks" - session_time_out: "Сессия истекла. Пожалуйста %{link}" - session_will_expire: "сессия истекает после %{hours} часов отсутствия активности." - session_will_not_expire: "сессия не будет истекать." - sign_in: "Войти" - successful: "Вход успешен. С возвращением!" - successful_with_session_info: "Вход выполнен:" - unsuccessful: "Неудачная попытка входа." - user_no_expiry: "Оставаться" + openid_identity_url_not_found: Извините, пользователя с такой ссылкой URL не существует (%{identity_url}) + option_separator: или, + please_login: Пожалуйста авторизуйтесь, чтобы использовать Tracks + session_time_out: Сессия истекла. Пожалуйста %{link} + session_will_expire: сессия истекает после %{hours} часов отсутствия активности. + session_will_not_expire: сессия не будет истекать. + sign_in: Войти + signup_prompt: Want to create an account? + successful: Вход успешен. С возвращением! + successful_with_session_info: 'Вход выполнен:' + unsuccessful: Неудачная попытка входа. + user_no_expiry: Оставаться models: preference: - due_in: "Выполнить за %{days} дней" - due_on: "Дата выполнения - %{date}" + due_in: Выполнить за %{days} дней + due_on: Дата выполнения - %{date} due_styles: - - "Выполнить за ___ дней" - - "Выполнить к _______" + - Выполнить за ___ дней + - Выполнить к _______ + themes: + black: Black + light_blue: Light blue project: - feed_description: "Список всех проектов %{username}" - feed_title: "Проекты Tracks" + feed_description: Список всех проектов %{username} + feed_title: Проекты Tracks todo: - error_date_must_be_future: "дата должна быть больше текущей" + error_date_must_be_future: дата должна быть больше текущей user: - error_context_not_associated: "Идентификатор контекста '%{context}' не соответствует - идентификатору пользователя %{user}." - error_project_not_associated: "Идентификатор проекта '%{project}' не соответствует - идентификатору пользователя %{user}." + error_context_not_associated: Идентификатор контекста '%{context}' не соответствует идентификатору пользователя %{user}. + error_project_not_associated: Идентификатор проекта '%{project}' не соответствует идентификатору пользователя %{user}. notes: - deleted_note: "Удалено '%{id}'" - delete_confirmation: "Уверены, что хотите удалить заметку '%{id}'?" - delete_item_title: "Удалить элемент" - delete_note_confirm: "Уверены, что хотите удалить заметку '%{id}'?" - delete_note_title: "Удалить заметку '%{id}'" - edit_item_title: "Редактировать элемент" - in_project: "В:" - note_header: "Заметка %{id}" - note_link_title: "Показать заметку %{id}" - note_location_link: "В:" - no_notes_available: "На текущий момент заметок нет: добавьте заметки к проектам - со страниц проектов." - show_note_title: "Показать заметку" + delete_confirmation: Уверены, что хотите удалить заметку '%{id}'? + delete_item_title: Удалить элемент + delete_note_confirm: Уверены, что хотите удалить заметку '%{id}'? + delete_note_title: Удалить заметку '%{id}' + deleted_note: Удалено '%{id}' + edit_item_title: Редактировать элемент + in_project: 'В:' + no_notes_available: 'На текущий момент заметок нет: добавьте заметки к проектам со страниц проектов.' + note_header: Заметка %{id} + note_link_title: Показать заметку %{id} + note_location_link: 'В:' + save_status_message: Note %{id} was saved + show_note_title: Показать заметку number: currency: format: @@ -513,11 +509,11 @@ ru: decimal_units: format: "%n %u" units: - billion: "Миллиард" - million: "Миллион" - quadrillion: "Квадрильон" - thousand: "Тысяча" - trillion: "Триллион" + billion: Миллиард + million: Миллион + quadrillion: Квадрильон + thousand: Тысяча + trillion: Триллион unit: "." format: delimiter: '' @@ -528,12 +524,12 @@ ru: format: "%n %u" units: byte: - one: "байт" - other: "байт" - gb: "Гб" - kb: "Кб" - mb: "Мб" - tb: "Тб" + one: байт + other: байт + gb: Гб + kb: Кб + mb: Мб + tb: Тб percentage: format: delimiter: '' @@ -542,269 +538,264 @@ ru: format: delimiter: '' preferences: - authentication_header: "Ваша авторизация" - change_authentication_type: "Изменить Ваш тип авторизации" - change_identity_url: "Изменить URL идентификации" - change_password: "Изменить пароль" - current_authentication_type: "Ваш тип авторизации %{auth_type}" - edit_preferences: "Изменить настройки" - generate_new_token: "Создать новый ключ" - generate_new_token_confirm: "Вы уверены? Создание нового ключа, заменит текущий - и нарушит все внешние взаимодействия, которые использовали предыдущий ключ." - is_false: "Нет" - is_true: "Да" - open_id_url: "Ваш OpenID URL" + authentication_header: Ваша авторизация + change_authentication_type: Изменить Ваш тип авторизации + change_identity_url: Изменить URL идентификации + change_password: Изменить пароль + current_authentication_type: Ваш тип авторизации %{auth_type} + edit_preferences: Изменить настройки + generate_new_token: Создать новый ключ + generate_new_token_confirm: Вы уверены? Создание нового ключа, заменит текущий и нарушит все внешние взаимодействия, которые использовали предыдущий ключ. + is_false: Нет + is_true: Да + open_id_url: Ваш OpenID URL page_title: TRACKS::Настройки page_title_edit: TRACKS::Редактирование настроек - password_changed: "Пароль изменен, пожалуйста войдите снова." - show_number_completed: "Отображать %{number} выполненных элементов" - sms_context_none: "Нет" - staleness_starts_after: "Устаревание начинается после %{days} дней" + password_changed: Пароль изменен, пожалуйста войдите снова. + remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + show_number_completed: Отображать %{number} выполненных элементов + sms_context_none: Нет + staleness_starts_after: Устаревание начинается после %{days} дней tabs: - authentication: "Авторизация" - date_and_time: "Дата и время" - profile: "Профиль" - tracks_behavior: "Поведение Tracks" - title: "Ваши настройки" - token_description: "Ключ (используется для лент новостей и API)" - token_header: "Ваш ключ" - updated: "Настройки изменены" + authentication: Авторизация + date_and_time: Дата и время + profile: Профиль + remove_account: Remove account + tracks_behavior: Поведение Tracks + title: Ваши настройки + token_description: Ключ (используется для лент новостей и API) + token_header: Ваш ключ + updated: Настройки изменены projects: - actions_in_project_title: "Действия проекта" - active_projects: "Активные проекты" - add_note: "Добавить заметку" - add_note_submit: "Добавить заметку" - add_project: "Добавить проект" + actions_in_project_title: Действия проекта + active_projects: Активные проекты + add_note: Добавить заметку + add_note_submit: Добавить заметку + add_project: Добавить проект all_completed_tasks_title: TRACKS::Список выполненных действий в проекте '%{project_name}' - completed_projects: "Выполненные проекты" + completed_actions: Completed actions + completed_actions_empty: Completed actions empty + completed_projects: Выполненные проекты completed_tasks_title: TRACKS::Список выполненных действий проекта '%{project_name}' - default_context: "Контекст по-умолчанию для этого проекта %{context}" - default_context_removed: "Удален контекст по-умолчанию" - default_context_set: "Установить для проекта контекст %{default_context} по-умолчанию" - default_tags_removed_notice: "Метки по-умолчанию удалены" - delete_project: "Удалить проект" - delete_project_confirmation: "Уверены, что хотите удалить проект '%{name}'?" - delete_project_title: "Удалить проект" - edit_project_settings: "Изменить настройки проекта" - edit_project_title: "Редактировать проект" - hidden_projects: "Скрытые проекты" - hide_form: "Скрыть форму" - hide_form_title: "Скрыть форму нового проекта" - is_active: "активен" + default_context: Контекст по-умолчанию для этого проекта %{context} + default_context_removed: Удален контекст по-умолчанию + default_context_set: Установить для проекта контекст %{default_context} по-умолчанию + default_tags_removed_notice: Метки по-умолчанию удалены + deferred_actions: Deferred actions + deferred_actions_empty: Deferred actions empty + delete_project: Удалить проект + delete_project_confirmation: Уверены, что хотите удалить проект '%{name}'? + delete_project_title: Удалить проект + edit_project_settings: Изменить настройки проекта + edit_project_title: Редактировать проект + hidden_projects: Скрытые проекты + hide_form: Скрыть форму + hide_form_title: Скрыть форму нового проекта + is_active: активен last_completed_in_project: "(последние %{number})" list_completed_projects: TRACKS::Список выполненных проектов list_projects: TRACKS::Список проектов list_reviews: TRACKS::Обзор - notes: "Заметки" - notes_empty: "Нет заметок к этому проекту" - no_default_context: "Этот проект не имеет контекста по-умолчанию" - no_last_completed_projects: "Не найдено выполненных проектов" - no_last_completed_recurring_todos: "Не найдено выполненных регулярных задач" - no_notes_attached: "На текущий момент нет примечаний присоединенных к проекту" - no_projects: "На текущий момент нет проектов" + no_default_context: Этот проект не имеет контекста по-умолчанию + no_last_completed_projects: Не найдено выполненных проектов + no_last_completed_recurring_todos: Не найдено выполненных регулярных задач + no_notes_attached: На текущий момент нет примечаний присоединенных к проекту + no_projects: На текущий момент нет проектов + notes: Заметки + notes_empty: Нет заметок к этому проекту page_title: 'TRACKS::Проект: %{project}' - project_saved_status: "Проект сохранен" - project_state: "Проект в состоянии %{state}." - settings: "Настройки" - set_default_tags_notice: "Установить метки %{default_tags} по-умолчанию для проекта" - show_form: "Добавить проект" - show_form_title: "Создать новый проект" - state: "Проект в состояниии %{state}" - status_project_name_changed: "Имя проекта изменено" - this_project: "Этот проект" - to_new_project_page: "Перейти на страницу нового проекта" - was_marked_complete: "помечен как выполненный" - was_marked_hidden: "помечен как скрытый" - with_default_context: "с контекстом по-умолчанию '%{context_name}'" - with_default_tags: "и с меткой '%{tags}' по-умолчанию" - with_no_default_context: "без контекста по-умолчанию" - with_no_default_tags: "и без меток по-умолчанию" + project_destroyed_status: Deleted project '%{name}' + project_saved_status: Проект сохранен + project_state: Проект в состоянии %{state}. + set_default_tags_notice: Установить метки %{default_tags} по-умолчанию для проекта + settings: Настройки + show_form: Добавить проект + show_form_title: Создать новый проект + state: Проект в состояниии %{state} + status_project_name_changed: Имя проекта изменено + this_project: Этот проект + to_new_project_page: Перейти на страницу нового проекта + was_marked_complete: помечен как выполненный + was_marked_hidden: помечен как скрытый + with_default_context: с контекстом по-умолчанию '%{context_name}' + with_default_tags: и с меткой '%{tags}' по-умолчанию + with_no_default_context: без контекста по-умолчанию + with_no_default_tags: и без меток по-умолчанию search: - contexts_matching_query: "Совпадающий контекст" - notes_matching_query: "Совпадающие заметки" - no_results: "Поиск не дал результатов." - projects_matching_query: "Совпадающие проекты" - tags_matching_query: "Совпадающие тэги" - todos_matching_query: "Совпадающие задачи" + contexts_matching_query: Совпадающий контекст + no_results: Поиск не дал результатов. + notes_matching_query: Совпадающие заметки + projects_matching_query: Совпадающие проекты + tags_matching_query: Совпадающие тэги + todos_matching_query: Совпадающие задачи shared: - add_action: "Добавить действие" - add_actions: "Добавить действия" - add_context: "Добавить контекст" - context_for_all_actions: "Контекст для всех действий" - hide_action_form_title: "Скрыть форму нового действия" - hide_form: "Скрыть форму" - make_actions_dependent: "Сделать действия зависимыми друг от друга" - multiple_next_actions: "Несколько дальнейших действий (по одному на строке)" - project_for_all_actions: "Проект для всех действий" - separate_tags_with_commas: "через запятую" - tags_for_all_actions: "Метки для всех действий (через запятую)" - toggle_multi: "Добавить несколько дальнейших действий" - toggle_multi_title: "Переключить режим ввода новых действий (одно/несколько)" - toggle_single: "Добавить дальнейшее действие" - toggle_single_title: "Добавить новое дальнейшее действие" + add_action: Добавить действие + add_actions: Добавить действия + add_context: Добавить контекст + context_for_all_actions: Контекст для всех действий + hide_action_form_title: Скрыть форму нового действия + hide_form: Скрыть форму + make_actions_dependent: Сделать действия зависимыми друг от друга + multiple_next_actions: Несколько дальнейших действий (по одному на строке) + project_for_all_actions: Проект для всех действий + separate_tags_with_commas: через запятую + tags_for_all_actions: Метки для всех действий (через запятую) + toggle_multi: Добавить несколько дальнейших действий + toggle_multi_title: Переключить режим ввода новых действий (одно/несколько) + toggle_single: Добавить дальнейшее действие + toggle_single_title: Добавить новое дальнейшее действие sidebar: - list_empty: "Пустой" - list_name_active_contexts: "Активные контексты" - list_name_active_projects: "Активные проекты" - list_name_completed_projects: "Выполненные проекты" - list_name_hidden_contexts: "Скрытые контексты" - list_name_hidden_projects: "Скрытые проекты" + list_empty: Пустой + list_name_active_contexts: Активные контексты + list_name_active_projects: Активные проекты + list_name_completed_projects: Выполненные проекты + list_name_hidden_contexts: Скрытые контексты + list_name_hidden_projects: Скрытые проекты states: - active: "Активный" - active_plural: "Активные" - blocked: "Блокированный" - blocked_plural: "Блокированные" - close: "Закрытый" - closed_plural: "Закрытые" - completed: "Выполнен" - completed_plural: "Выполненные" + active: Активный + active_plural: Активные + blocked: Блокированный + blocked_plural: Блокированные + close: Закрытый + closed_plural: Закрытые + completed: Выполнен + completed_plural: Выполненные contexts: - active: "Активных контекстов" - closed: "Закрытых контекстов" - hidden: "Скрытых контекстов" - current: "Актуальный" - current_plural: "Актуальные" - hidden: "Скрытый" - hidden_plural: "Скрытые" + ":": ":" + active: Активных контекстов + closed: Закрытых контекстов + hidden: Скрытых контекстов + current: Актуальный + current_plural: Актуальные + hidden: Скрытый + hidden_plural: Скрытые projects: - active: "Активных проектов" - blocked: "Заблокированные" + ":": ":" + active: Активных проектов + blocked: Заблокированные closed: Closed projects - completed: "выполненные" - current: "Текущие" - hidden: "Скрытых проектов" - review: "Требуют проверки" - stalled: "Подвисшие" - review: "Просрочен" - review_plural: "Просрочены" - stalled: "Устаревший" - stalled_plural: "Устаревшие" - visible: "Видимый" - visible_plural: "Видимые" + completed: выполненные + current: Текущие + hidden: Скрытых проектов + review: Требуют проверки + stalled: Подвисшие + review: Просрочен + review_plural: Просрочены + stalled: Устаревший + stalled_plural: Устаревшие + visible: Видимый + visible_plural: Видимые stats: - actions: "Действия" - actions_30days_title: "Действия за последние 30 дней" - actions_actions_avg_created_30days: "За последние 30 дней вы создали в среднем - %{count} действий" - actions_avg_completed: "и выполняли в среднем %{count} действий в месяц." - actions_avg_completed_30days: "выполнено в среднем %{count} действий в день." - actions_avg_completion_time: "Все ваши выполненные действия, среднее время выполнения - %{count} дней." - actions_avg_created: "За последние 12 месяцев вы создали в среднем %{count} действий" - actions_day_of_week_legend: - day_of_week: "День недели" - number_of_actions: "Количество действий" - actions_day_of_week_title: "День недели (все действия)" - actions_dow_30days_legend: - day_of_week: "День недели" - number_of_actions: "Количество действий" - actions_dow_30days_title: "Дни недели (за последние 30 дней)" - actions_further: "и далее" - actions_lastyear_title: "Действия за последние 12 месяцев" - actions_last_year: "Действия за последние годы" - actions_last_year_legend: - months_ago: "Месяцев назад" - number_of_actions: "Количество действий" - actions_min_completion_time: "Минимальное время выполнения %{time}." - actions_min_max_completion_days: "Минимум/максимум дней до выполнения %{min}/%{max}." - actions_selected_from_week: "Действия, выбранные из недели" - action_completion_time_title: "Время выполнения (все выполненные действия)" + action_completion_time_title: Время выполнения (все выполненные действия) action_selection_title: TRACKS::Действие выбор - click_to_return: "Нажмите %{link}, чтобы вернуться к странице статистики." - click_to_return_link: "здесь" - click_to_show_actions_from_week: "Кликните %{link}, чтобы отобразить действия - из %{week} недели и далее." - click_to_update_actions: "Нажмите на панель в диаграмме, чтобы обновить действия - ниже." - contexts: "Контексты" - current_running_time_of_incomplete_visible_actions: "Текущее время работы над - незавершенными видимыми действиями" + actions: Действия + actions_30days_title: Действия за последние 30 дней + actions_actions_avg_created_30days: За последние 30 дней вы создали в среднем %{count} действий + actions_avg_completed: и выполняли в среднем %{count} действий в месяц. + actions_avg_completed_30days: выполнено в среднем %{count} действий в день. + actions_avg_completion_time: Все ваши выполненные действия, среднее время выполнения %{count} дней. + actions_avg_created: За последние 12 месяцев вы создали в среднем %{count} действий + actions_day_of_week_legend: + day_of_week: День недели + number_of_actions: Количество действий + actions_day_of_week_title: День недели (все действия) + actions_dow_30days_legend: + day_of_week: День недели + number_of_actions: Количество действий + actions_dow_30days_title: Дни недели (за последние 30 дней) + actions_further: и далее + actions_last_year: Действия за последние годы + actions_last_year_legend: + months_ago: Месяцев назад + number_of_actions: Количество действий + actions_lastyear_title: Действия за последние 12 месяцев + actions_min_completion_time: Минимальное время выполнения %{time}. + actions_min_max_completion_days: Минимум/максимум дней до выполнения %{min}/%{max}. + actions_selected_from_week: Действия, выбранные из недели + click_to_return: Нажмите %{link}, чтобы вернуться к странице статистики. + click_to_return_link: здесь + click_to_show_actions_from_week: Кликните %{link}, чтобы отобразить действия из %{week} недели и далее. + click_to_update_actions: Нажмите на панель в диаграмме, чтобы обновить действия ниже. + contexts: Контексты + current_running_time_of_incomplete_visible_actions: Текущее время работы над незавершенными видимыми действиями index_title: TRACKS::Статистика labels: - avg_completed: "В среднем выполнено" - avg_created: "В среднем создано" - completed: "Выполнено" - created: "Создано" + avg_completed: В среднем выполнено + avg_created: В среднем создано + completed: Выполнено + created: Создано month_avg_completed: "%{months} Выполнено в среднем за месяц" month_avg_created: "%{months} Создано в среднем за месяц" legend: - actions: "Действия" - day_of_week: "Дней недели" - months_ago: "Месяцев назад" - number_of_actions: "Количество действий" - number_of_days: "Дней назад" - percentage: "Процент" - running_time: "Затрачено времени на задачу (недель)" - more_stats_will_appear: "Больше статистики появится здесь как только вы добавите - действия." - no_actions_selected: "Нет выбранных действий." - no_tags_available: "нет доступных меток" - open_per_week: "Активные (видимые и скрытые) дальнейшие действия за неделю" + actions: Действия + day_of_week: Дней недели + months_ago: Месяцев назад + number_of_actions: Количество действий + number_of_days: Дней назад + percentage: Процент + running_time: Затрачено времени на задачу (недель) + more_stats_will_appear: Больше статистики появится здесь как только вы добавите действия. + no_actions_selected: Нет выбранных действий. + no_tags_available: нет доступных меток + open_per_week: Активные (видимые и скрытые) дальнейшие действия за неделю open_per_week_legend: - actions: "Действия" - weeks: "Недель назад" + actions: Действия + weeks: Недель назад other_actions_label: "(другие)" - projects: "Проекты" - running_time_all: "Текущее время выполнения всех незавершенных действий" + projects: Проекты + running_time_all: Текущее время выполнения всех незавершенных действий running_time_all_legend: - actions: "Действия" - percentage: "Процент" - running_time: "Время выполнения действия (недель). Нажмите на панель для более - подробной информации." + actions: Действия + percentage: Процент + running_time: Время выполнения действия (недель). Нажмите на панель для более подробной информации. running_time_legend: - actions: "Действия" - percentage: "Процент" - weeks: "Время выполнения действия (недель). Кликните на панель для дополнительной - информации" - spread_of_actions_for_all_context: "Распределение выполняемых действий для все - контекстов" - spread_of_running_actions_for_visible_contexts: "Распределение выполняемых действий - для видимых контекстов" - tags: "Метки" - tag_cloud_90days_description: "Это облако меток действия включает те, что были - созданы или выполнены за последние 90 дней." - tag_cloud_90days_title: "Облако меток для всех действий за последние 90 дней" - tag_cloud_description: "Это облако меток для включает метки всех действий (выполненных, - невыполенных, видимых или скрытых)" - tag_cloud_title: "Облако меток для всех действий" - time_of_day: "Время дня (все действия)" + actions: Действия + percentage: Процент + weeks: Время выполнения действия (недель). Кликните на панель для дополнительной информации + spread_of_actions_for_all_context: Распределение выполняемых действий для все контекстов + spread_of_running_actions_for_visible_contexts: Распределение выполняемых действий для видимых контекстов + tag_cloud_90days_description: Это облако меток действия включает те, что были созданы или выполнены за последние 90 дней. + tag_cloud_90days_title: Облако меток для всех действий за последние 90 дней + tag_cloud_description: Это облако меток для включает метки всех действий (выполненных, невыполенных, видимых или скрытых) + tag_cloud_title: Облако меток для всех действий + tags: Метки + time_of_day: Время дня (все действия) time_of_day_legend: - number_of_actions: "Количество действий" - time_of_day: "Время дня" - tod30: "Время дней (последние 30 дней)" + number_of_actions: Количество действий + time_of_day: Время дня + tod30: Время дней (последние 30 дней) tod30_legend: - number_of_actions: "Количество действий" - time_of_day: "Время дня" + number_of_actions: Количество действий + time_of_day: Время дня top10_longrunning: 10 самых долгих проектов - top10_projects: "Топ 10 проектов" - top10_projects_30days: "Топ 10 проектов за последние 30 дней" - top5_contexts: "Топ 5 контекстов" - top5_visible_contexts_with_incomplete_actions: "Топ 5 видимых контекстов с незавершенными - действиями" - totals: "Итого" + top10_projects: Топ 10 проектов + top10_projects_30days: Топ 10 проектов за последние 30 дней + top5_contexts: Топ 5 контекстов + top5_visible_contexts_with_incomplete_actions: Топ 5 видимых контекстов с незавершенными действиями + totals: Итого + totals_action_count: У вас всего %{count} действий totals_actions_completed: "%{count} из них выполнены." - totals_action_count: "У вас всего %{count} действий" - totals_active_project_count: "Из них %{count} активных проектов" + totals_active_project_count: Из них %{count} активных проектов totals_blocked_actions: "%{count} зависят от выполнения связанных действий." - totals_completed_project_count: "и %{count} выполненных проектов." - totals_context_count: "У Вас %{count} контекстов." - totals_deferred_actions: "из которых %{count} отложенные действия" - totals_first_action: "С первого действия %{date}" - totals_hidden_context_count: "и %{count} скрытых контекстов." + totals_completed_project_count: и %{count} выполненных проектов. + totals_context_count: У Вас %{count} контекстов. + totals_deferred_actions: из которых %{count} отложенные действия + totals_first_action: С первого действия %{date} + totals_hidden_context_count: и %{count} скрытых контекстов. totals_hidden_project_count: "%{count} скрыты" - totals_incomplete_actions: "У Вас %{count} незавершенных действий" - totals_project_count: "У Вас %{count} проектов." - totals_tag_count: "У Вас %{count} меток присвоено действиям." - totals_unique_tags: "Из этих меток, %{count} уникальные." - totals_visible_context_count: "Из них %{count} видимые контексты" - within_one: "В пределах 1" + totals_incomplete_actions: У Вас %{count} незавершенных действий + totals_project_count: У Вас %{count} проектов. + totals_tag_count: У Вас %{count} меток присвоено действиям. + totals_unique_tags: Из этих меток, %{count} уникальные. + totals_visible_context_count: Из них %{count} видимые контексты + within_one: В пределах 1 support: array: last_word_connector: ", и" - two_words_connector: "и" + two_words_connector: и words_connector: "," select: - prompt: "Выберите..." + prompt: Выберите... time: am: am formats: @@ -816,351 +807,343 @@ ru: time: '' pm: pm todos: - actions: - completed: "Выполненные действия" - context_completed: "Выполненные действия в этом контексте" - context_deferred_pending: "Отложенные/ожидающие действия в этом контексте" - context_without_project: "Действия вне проектов в '%{param}'" - home_completed: "Выполненные действия" - home_without_project: "Действия без проекта" - project_completed: "Выполненные действия в этом проекте" - project_deferred_pending: "Отложенные/ожидающие действия в этом проекте" - project_project: "Действия в этом проекте" - tag_completed: "Выполненные действия с меткой '%{param}'" - tag_deferred_pending: "Отложенные/ожидающие действия с меткой '%{param}'" - tag_hidden: "Скрытые действия с меткой '%{param}'" - action_deferred: "Действие '%{description}' было отложено" - action_deleted_error: "Не удалось удалить действие" - action_deleted_success: "Успешно удалено дальнейшее действие" + action_deferred: Действие '%{description}' было отложено + action_deleted_error: Не удалось удалить действие + action_deleted_success: Успешно удалено дальнейшее действие action_due_on: "(действие выполнить к %{date})" - action_marked_complete: "Действие '%{description}' отмечено как - %{completed}" - action_marked_complete_error: "Действие '%{description}' НЕ помечено - как %{completed} из-за ошибки на сервере." - action_saved: "Действие сохранено" - action_saved_to_tickler: "Действие сохранено в Отложенные" - added_dependency: "Добавлена зависимость %{dependency}." - added_new_context: "Добавлен новый контекст" - added_new_next_action: "Добавлено новое дальнейшее действие" - added_new_next_action_plural: "Добавлены новые дальнейшие действия" - added_new_next_action_singular: "Добавлено новое дальнейшее действие" - added_new_project: "Добавлен новый проект" - add_another_dependency: "Добавить еще зависимости" - add_new_recurring: "Добавить новую регулярную задачу" - all_completed: "Все выполненные действия" - all_completed_here: "здесь" + action_marked_complete: Действие '%{description}' отмечено как %{completed} + action_marked_complete_error: Действие '%{description}' НЕ помечено как %{completed} из-за ошибки на сервере. + action_saved: Действие сохранено + action_saved_to_tickler: Действие сохранено в Отложенные + actions: + completed: Выполненные действия + context_completed: Выполненные действия в этом контексте + context_deferred_pending: Отложенные/ожидающие действия в этом контексте + context_without_project: Действия вне проектов в '%{param}' + home_completed: Выполненные действия + home_without_project: Действия без проекта + project_completed: Выполненные действия в этом проекте + project_deferred_pending: Отложенные/ожидающие действия в этом проекте + project_project: Действия в этом проекте + tag_completed: Выполненные действия с меткой '%{param}' + tag_deferred_pending: Отложенные/ожидающие действия с меткой '%{param}' + tag_hidden: Скрытые действия с меткой '%{param}' + add_another_dependency: Добавить еще зависимости + add_new_recurring: Добавить новую регулярную задачу + added_dependency: Добавлена зависимость %{dependency}. + added_new_context: Добавлен новый контекст + added_new_next_action: Добавлено новое дальнейшее действие + added_new_next_action_plural: Добавлены новые дальнейшие действия + added_new_next_action_singular: Добавлено новое дальнейшее действие + added_new_project: Добавлен новый проект + all_completed: Все выполненные действия + all_completed_here: здесь all_completed_tagged_page_title: TRACKS::Все выполненные задачи с меткой %{tag_name} - append_in_this_project: "в этом проекте" + append_in_this_project: в этом проекте archived_tasks_title: TRACKS::Архивные выполненные задачи - blocked_by: "Блокировано %{predecessors}" + blocked_by: Блокировано %{predecessors} calendar: - due_after_this_month: "Выполнить после %{next_month}" - due_next_week: "Выполнить за следующую неделю" - due_this_month: "Выполнить до конца %{month}" - due_this_week: "Выполнить до конца недели" - due_today: "Выполнить сегодня" - get_in_ical_format: "Получить календарь в формате iCal" + due_after_this_month: Выполнить после %{next_month} + due_next_week: Выполнить за следующую неделю + due_this_month: Выполнить до конца %{month} + due_this_week: Выполнить до конца недели + due_today: Выполнить сегодня + get_in_ical_format: Получить календарь в формате iCal calendar_page_title: TRACKS::Календарь - cannot_add_dependency_to_completed_todo: "Невозможно добавить действие как зависимость - к выполненному действию!" - clear_due_date: "Очистить дату 'Выполнить к'" - clear_show_from_date: "Очистить дату 'Показывать с'" - completed: "Выполнено" - completed_actions_with: "Выполненные действия с меткой '%{tag_name}'" + cannot_add_dependency_to_completed_todo: Невозможно добавить действие как зависимость к выполненному действию! + clear_due_date: Очистить дату 'Выполнить к' + clear_show_from_date: Очистить дату 'Показывать с' + completed: Выполнено + completed_actions: Completed actions + completed_actions_with: Выполненные действия с меткой '%{tag_name}' completed_in_archive: - one: 1 выполненное действие в архиве. few: "%{count} выполненных действия в архиве." + one: 1 выполненное действие в архиве. other: "%{count} выполненных действий в архиве." - completed_last_day: "Выполнены за последние 24 часа" - completed_last_x_days: "Выполнены за последние %{count} дней" - completed_recurrence_completed: "Нет дальнейших действий, которые следуют за удаленной - регулярной задачей. Повторение остановлено" - completed_recurring: "Выполненные регулярные задачи" - completed_rest_of_month: "Выполнено за остаток месяца" - completed_rest_of_previous_month: "Выполнено в конце предыдущего месяца" - completed_rest_of_week: "Выполнено за остаток недели" + completed_last_day: Выполнены за последние 24 часа + completed_last_x_days: Выполнены за последние %{count} дней + completed_recurrence_completed: Нет дальнейших действий, которые следуют за удаленной регулярной задачей. Повторение остановлено + completed_recurring: Выполненные регулярные задачи + completed_recurring_actions_title: TRACKS::Completed recurring actions + completed_rest_of_month: Выполнено за остаток месяца + completed_rest_of_previous_month: Выполнено в конце предыдущего месяца + completed_rest_of_week: Выполнено за остаток недели completed_tagged_page_title: TRACKS::Выполненные задачи с меткой '%{tag_name}' completed_tasks_title: TRACKS::Выполненные задачи - completed_today: "Выполнено сегодня" - confirm_delete: "Уверены, что хотите удалить действие '%{description}'?" - context_changed: "Контекст изменен на %{name}" - convert_to_project: "Сформировать проект" - deferred_actions_with: "Отложенные действия с меткой '%{tag_name}'" - deferred_pending_actions: "Отложенные/ожидающие действия" - deferred_tasks_title: TRACKS::Отложенные - defer_date_after_due_date: "Дата отсрочки превышает дату выполнения. Измените - дату выполнения, перед тем как отложить это действие." + completed_today: Выполнено сегодня + confirm_delete: Уверены, что хотите удалить действие '%{description}'? + context_changed: Контекст изменен на %{name} + convert_to_project: Сформировать проект + defer_date_after_due_date: Дата отсрочки превышает дату выполнения. Измените дату выполнения, перед тем как отложить это действие. defer_x_days: - one: "Отложить на 1 день" - few: "Отложить на %{count} дня" - other: "Отложить на %{count} дней" - delete: "Удалить" - deleted_success: "Действие успешно удалено." - delete_action: "Удалить действие" - delete_recurring_action_confirm: "Уверены, что хотите удалить регулярную задачу - '%{description}'?" - delete_recurring_action_title: "Удалить регулярную задачу" - depends_on: "Зависит от" - depends_on_separate_with_commas: "Зависит от (через запятую)" - done: "Готово?" - drag_action_title: "Перетащите на другое действие, чтобы сделать его зависимым - от него" - due: "Выполнить к" - edit: "Редактировать" - edit_action: "Редактирвоать действие" - edit_action_with_description: "Редактировать действие '%{description}'" - edit_recurring_todo: "Редактировать регулярную задачу" + few: Отложить на %{count} дня + one: Отложить на 1 день + other: Отложить на %{count} дней + deferred_actions_with: Отложенные действия с меткой '%{tag_name}' + deferred_pending_actions: Отложенные/ожидающие действия + deferred_tasks_title: TRACKS::Отложенные + delete: Удалить + delete_action: Удалить действие + delete_recurring_action_confirm: Уверены, что хотите удалить регулярную задачу '%{description}'? + delete_recurring_action_title: Удалить регулярную задачу + deleted_success: Действие успешно удалено. + depends_on: Зависит от + depends_on_separate_with_commas: Зависит от (через запятую) + done: Готово? + drag_action_title: Перетащите на другое действие, чтобы сделать его зависимым от него + due: Выполнить к + edit: Редактировать + edit_action: Редактирвоать действие + edit_action_with_description: Редактировать действие '%{description}' + edit_recurring_todo: Редактировать регулярную задачу error: - invalid_due_date: "Некорректная дата 'Выполнить к'" - invalid_show_from_date: "Некорректная дата 'Показывать с'" - error_completing_todo: "Ошибка выполнения/активации регулярной задачи %{description}" - error_deleting_item: "Произошла ошибка при удалении элемента %{description}" - error_deleting_recurring: "Возникла ошибка при удалении регулярной задачи '%{description}'" - error_removing_dependency: "Ошибка при удалении зависимости" - error_saving_recurring: "Ошибка при сохранении регулярной задачи '%{description}'" - error_starring: "невозможно переключить отметку на задаче '%{description}'" - error_starring_recurring: "Невозможно установить/снять отметку регулярной задачи - '%{description}'" - error_toggle_complete: "Невозможно отметить эту задачу как выполненную" + invalid_due_date: Некорректная дата 'Выполнить к' + invalid_show_from_date: Некорректная дата 'Показывать с' + error_completing_todo: Ошибка выполнения/активации регулярной задачи %{description} + error_deleting_item: Произошла ошибка при удалении элемента %{description} + error_deleting_recurring: Возникла ошибка при удалении регулярной задачи '%{description}' + error_removing_dependency: Ошибка при удалении зависимости + error_saving_recurring: Ошибка при сохранении регулярной задачи '%{description}' + error_starring: невозможно переключить отметку на задаче '%{description}' + error_starring_recurring: Невозможно установить/снять отметку регулярной задачи '%{description}' + error_toggle_complete: Невозможно отметить эту задачу как выполненную + feed_title_in_context: в контексте '%{context}' + feed_title_in_project: в проекте '%{project}' feeds: - completed: "Выполено: %{date}" - due: "Выполнить к: %{date}" - feed_title_in_context: "в контексте '%{context}'" - feed_title_in_project: "в проекте '%{project}'" + completed: 'Выполено: %{date}' + due: 'Выполнить к: %{date}' has_x_pending: - one: "Одно ожидающее действие" few: "%{count} ожидающих действия" + one: Одно ожидающее действие other: "%{count} ожидающих действий" - hidden_actions: "Скрытые действия" - in_hidden_state: "в скрытом состоянии" - in_pending_state: "в ожидании" - list_incomplete_next_actions: "Выводит список незавершенных дальнейших действий" - list_incomplete_next_actions_with_limit: "Выводит список последних %{count} незавершенных - дальнейших действий" - mark_complete: "Отметить как выполненное" - mobile_todos_page_title: "Все действия" - new_related_todo_created: "Добавлена новая задача, принадлежащая этой регулярной - задаче" - new_related_todo_created_short: "создана новая задача" - new_related_todo_not_created_short: "не создана задача" - next_actions_description: "Фильтр:" + hidden_actions: Скрытые действия + in_hidden_state: в скрытом состоянии + in_pending_state: в ожидании + list_incomplete_next_actions: Выводит список незавершенных дальнейших действий + list_incomplete_next_actions_with_limit: Выводит список последних %{count} незавершенных дальнейших действий + mark_complete: Отметить как выполненное + mobile_todos_page_title: Все действия + new_related_todo_created: Добавлена новая задача, принадлежащая этой регулярной задаче + new_related_todo_created_short: создана новая задача + new_related_todo_not_created_short: не создана задача + next_action_description: Описание дальнейшего действия + next_action_needed: Необходимо создать хотя бы одно дальнейшее действие + next_actions_description: 'Фильтр:' next_actions_description_additions: - completed: "за последние %{count} дней" - due_date: "с запланированной датой %{due_date} или ранее" + completed: за последние %{count} дней + due_date: с запланированной датой %{due_date} или ранее next_actions_due_date: - due_in_x_days: "Выполнить за %{days} дней" - due_today: "Выполнить сегодня" - due_tomorrow: "Выполнить завтра" - overdue_by: "Просрочено на %{days} день" - overdue_by_plural: "Просрочено на %{days} дней" + due_in_x_days: Выполнить за %{days} дней + due_today: Выполнить сегодня + due_tomorrow: Выполнить завтра + overdue_by: Просрочено на %{days} день + overdue_by_plural: Просрочено на %{days} дней next_actions_title: TRACKS::Дальнейшие действия next_actions_title_additions: - completed: "действие выполнено" - due_today: "за сегодня" - due_within_a_week: "в пределах недели" - next_action_description: "Описание дальнейшего действия" - next_action_needed: "Необходимо создать хотя бы одно дальнейшее действие" + completed: действие выполнено + due_today: за сегодня + due_within_a_week: в пределах недели no_actions: - completed: "На текущий момент нет выполненных действий" - completed_recurring: "На текущий момент нет выполненных регулярных задач" - completed_rest_of_month: "За остаток месяца не было завершено ни одного действия" - completed_rest_of_week: "За остаток недели не было завершено ни одного действия" - completed_today: "Сегодня не было завершено ни одного действия" - context: "На текущий момент нет незавершенных действий в этом контексте" - deferred_pending: "На текущий момент нет отложенных или ожидающих задач" - due_after_this_month: "Нет действий на следующий месяц и далее" - due_next_week: "Нет действий на следующую неделю" - due_this_month: "Нет действий до конца месяца" - due_this_week: "Нет действий на этой неделе" - due_today: "Нет действий на сегодня" - hidden: "На текущий момент не найдено скрытых действий" - not_done: "На текущий момент нет незавершенных действий" - not_done_context: "На текущий момент нет невыполненных действий в данном контексте" - not_done_project: "На текущий момент нет невыполненных действий в данном проекте" - not_done_with_tag: "На текущий момент нет невыполненных действий с меткой '%{param}'" - project: "На текущий момент нет незавершенных действий в этом проекте" - recurring_todos: "На текущий момент нет регулярных задач" - tag_hidden: "На текущий момент не найдено скрытых действий" - title: "Действий не найдено" - without_project: "На текущий момент нет действий без проекта" - no_actions_due_this_week: "До конца недели нет действий" - no_last_completed_actions: "Не найдено выполненных действий" + completed: На текущий момент нет выполненных действий + completed_recurring: На текущий момент нет выполненных регулярных задач + completed_rest_of_month: За остаток месяца не было завершено ни одного действия + completed_rest_of_week: За остаток недели не было завершено ни одного действия + completed_today: Сегодня не было завершено ни одного действия + context: На текущий момент нет незавершенных действий в этом контексте + deferred_pending: На текущий момент нет отложенных или ожидающих задач + due_after_this_month: Нет действий на следующий месяц и далее + due_next_week: Нет действий на следующую неделю + due_this_month: Нет действий до конца месяца + due_this_week: Нет действий на этой неделе + due_today: Нет действий на сегодня + hidden: На текущий момент не найдено скрытых действий + not_done: На текущий момент нет незавершенных действий + not_done_context: На текущий момент нет невыполненных действий в данном контексте + not_done_project: На текущий момент нет невыполненных действий в данном проекте + not_done_with_tag: На текущий момент нет невыполненных действий с меткой '%{param}' + project: На текущий момент нет незавершенных действий в этом проекте + recurring_todos: На текущий момент нет регулярных задач + tag_hidden: На текущий момент не найдено скрытых действий + title: Действий не найдено + without_project: На текущий момент нет действий без проекта + no_actions_due_this_week: До конца недели нет действий + no_actions_found_title: No actions found title + no_actions_with: No actions with + no_completed_actions: No completed actions + no_completed_actions_with: No completed actions with + no_completed_recurring: No completed recurring + no_deferred_actions: No deferred actions + no_deferred_actions_with: No deferred actions with + no_last_completed_actions: Не найдено выполненных действий no_project: "--Нет проекта--" - overdue: "Просроченные" - pending: "Ожидание" + no_recurring_todos: No recurring todos + notes: Notes + overdue: Просроченные + pending: Ожидание recurrence: - daily: "Ежедневно" - daily_every_number_day: "Каждые %{number} дней" - daily_options: "Настройки ежедневных регулярных задач" - day_x_on_every_x_month: "День %{day} каждый %{month} месяц" - ends_on: "Завершить" - ends_on_date: "Завершить %{date}" - ends_on_number_times: "Завершить после %{number} раз" - every_work_day: "Каждый будни день" - monthly: "Ежемесячно" + daily: Ежедневно + daily_every_number_day: Каждые %{number} дней + daily_options: Настройки ежедневных регулярных задач + day_x_on_every_x_month: День %{day} каждый %{month} месяц + ends_on: Завершить + ends_on_date: Завершить %{date} + ends_on_number_times: Завершить после %{number} раз + every_work_day: Каждый будни день + monthly: Ежемесячно monthly_every_xth_day: "%{day} %{day_of_week} каждого %{month} месяца" - monthly_options: "Настройки ежемесячных регулярных задач" - no_end_date: "Без даты" + monthly_options: Настройки ежемесячных регулярных задач + no_end_date: Без даты pattern: day_names: - - "воскресенье" - - "понедельник" - - "вторник" - - "среда" - - "четверг" - - "пятница" - - "суббота" + - воскресенье + - понедельник + - вторник + - среда + - четверг + - пятница + - суббота due: '' - every_day: "ежедневно" - every_month: "ежемесячно" - every_n: "каждый %{n}" - every_n_days: "каждый %{n}й день" - every_n_months: "каждый %{n}й месяц" - every_xth_day_of_every_n_months: "каждые %{x} %{day} каждого %{n_months}" - every_year_on: "каждый год %{date}" - first: "первый" - fourth: "четвертый" - from: "с" - last: "последний" + every_day: ежедневно + every_month: ежемесячно + every_n: каждый %{n} + every_n_days: каждый %{n}й день + every_n_months: каждый %{n}й месяц + every_xth_day_of_every_n_months: каждые %{x} %{day} каждого %{n_months} + every_year_on: каждый год %{date} + first: первый + fourth: четвертый + from: с + last: последний month_names: - - - "Январь" - - "Февраль" - - "Март" - - "Апрель" - - "Май" - - "Июнь" - - "Июль" - - "Август" - - "Сентябрь" - - "Октябрь" - - "Ноябрь" - - "Декабрь" - on_day_n: "на день %{n}" - on_work_days: "по рабочим дням" - second: "второй" - show: "показать" + - Январь + - Февраль + - Март + - Апрель + - Май + - Июнь + - Июль + - Август + - Сентябрь + - Октябрь + - Ноябрь + - Декабрь + on_day_n: на день %{n} + on_work_days: по рабочим дням + second: второй + show: показать the_xth_day_of_month: "%{x} %{day} %{month}" - third: "третий" + third: третий times: "%{number} раз" - until: "по" - weekly: "еженедельно" + until: по + weekly: еженедельно recurrence_on: - due_date: "даты выполнения" - from_tickler: "даты начала отображения задачи (но не для даты выполнения)" - options: "Вычислять дату для:" - show_always: "всегда" - show_days_before: "за %{days} дней до даты выполнения" - show_options: "Отображать действие" - starts_on: "Начать" - weekly: "Еженедельно" - weekly_every_number_week: "Каждые %{number} недель" - weekly_options: "Настройки еженедельных регулярных задач" - yearly: "Ежегодно" + due_date: даты выполнения + from_tickler: даты начала отображения задачи (но не для даты выполнения) + options: 'Вычислять дату для:' + show_always: всегда + show_days_before: за %{days} дней до даты выполнения + show_options: Отображать действие + starts_on: Начать + weekly: Еженедельно + weekly_every_number_week: Каждые %{number} недель + weekly_options: Настройки еженедельных регулярных задач + yearly: Ежегодно + yearly_every_x_day: Каждый %{month} %{day} yearly_every_xth_day: "%{day} %{day_of_week} %{month}" - yearly_every_x_day: "Каждый %{month} %{day}" - yearly_options: "Настройки ранних регулярных задач" - recurrence_completed: "Нет дальнейших действий, которые следуют за завершенной - регулярной задачей. Повторение остановлено." - recurrence_period: "Период повторения" + yearly_options: Настройки ранних регулярных задач + recurrence_completed: Нет дальнейших действий, которые следуют за завершенной регулярной задачей. Повторение остановлено. + recurrence_period: Период повторения + recurring_action_deleted: Задача удалена. Но создана новая, так как это регулярная задача + recurring_action_saved: Регулярная задача сохранена recurring_actions_title: TRACKS::Регулярные задачи - recurring_action_deleted: "Задача удалена. Но создана новая, так как это регулярная - задача" - recurring_action_saved: "Регулярная задача сохранена" - recurring_deleted_success: "Регулярная задача успешно удалена." - recurring_pattern_removed: "Шаблон повтора удален из %{count}" - recurring_todos: "Регулярные задачи" - removed_predecessor: "Удалено %{successor} как зависимость от %{predecessor}." - remove_dependency: "Удалить зависимость (не удаляет действий)" - scheduled_overdue: "Запланировано к показу %{days} дней спустя" - see_all_completed: "Все выполненные действия можно посмотреть здесь %{link}" + recurring_deleted_success: Регулярная задача успешно удалена. + recurring_pattern_removed: Шаблон повтора удален из %{count} + recurring_todos: Регулярные задачи + remove_dependency: Удалить зависимость (не удаляет действий) + removed_predecessor: Удалено %{successor} как зависимость от %{predecessor}. + scheduled_overdue: Запланировано к показу %{days} дней спустя + see_all_completed: Все выполненные действия можно посмотреть здесь %{link} set_to_pending: "%{task} поставлено в ожидание" - show_from: "Показывать с" - show_in_days: "Показать за %{days} дней" - show_on_date: "Дата показа - %{date}" - show_today: "Сегодня" - show_tomorrow: "Показать завтрашний день" - star_action: "Отметить это действие" - star_action_with_description: "отметить действие '%{description}'" + show_from: Показывать с + show_in_days: Показать за %{days} дней + show_on_date: Дата показа - %{date} + show_today: Сегодня + show_tomorrow: Показать завтрашний день + star_action: Отметить это действие + star_action_with_description: отметить действие '%{description}' tagged_page_title: TRACKS::Помеченные меткой '%{tag_name}' - tagged_with: "Установлена метка '%{tag_name}'" - tags: "Метки (через запятую)" + tagged_with: Установлена метка '%{tag_name}' + tags: Метки (через запятую) task_list_title: TRACKS::Список задач tickler_items_due: - one: "Отложенный элемент подошел к дате выполнения - обновите страницу, чтобы - увидеть изменения." - few: "%{count} отложенных элемента подошли к дате выполнения - обновите страницу, - чтобы увидеть изменения." - other: "%{count} отложенных элементов подошли к дате выполнения - обновите страницу, - чтобы увидеть изменения." - to_tickler: "в Отложенные" - unable_to_add_dependency: "Не удается добавить зависимость" - unresolved_dependency: "Введенное значение зависимости не соответствует существующим - действиям. Значние не будет сохранно, как и другие изменения. Продолжить?" - was_due_on_date: "было запланировано к %{date}" + few: "%{count} отложенных элемента подошли к дате выполнения - обновите страницу, чтобы увидеть изменения." + one: Отложенный элемент подошел к дате выполнения - обновите страницу, чтобы увидеть изменения. + other: "%{count} отложенных элементов подошли к дате выполнения - обновите страницу, чтобы увидеть изменения." + to_tickler: в Отложенные + unable_to_add_dependency: Не удается добавить зависимость + unresolved_dependency: Введенное значение зависимости не соответствует существующим действиям. Значние не будет сохранно, как и другие изменения. Продолжить? + was_due_on_date: было запланировано к %{date} users: - account_signup: "регистрация пользователя" - auth_change_submit: "Сменить тип авторизации" - auth_type_updated: "Тип авторизации обновлен." - auth_type_update_error: "Не удалось обновить ваш тип авторизации: %{error_messages}" - change_authentication_type: "Сменить тип авторизации" + account_signup: регистрация пользователя + approve_tos: I approve the Terms of Service + auth_change_submit: Сменить тип авторизации + auth_type_update_error: 'Не удалось обновить ваш тип авторизации: %{error_messages}' + auth_type_updated: Тип авторизации обновлен. change_auth_type_title: TRACKS::Изменение типа авторизации - change_password_prompt: "Введите новый пароль в поле ниже и нажмите 'Изменить - пароль', чтобы заменить ваш старый пароль." - change_password_submit: "Сменить пароль" + change_authentication_type: Сменить тип авторизации + change_password_prompt: Введите новый пароль в поле ниже и нажмите 'Изменить пароль', чтобы заменить ваш старый пароль. + change_password_submit: Сменить пароль change_password_title: TRACKS::Изменение пароля - choose_password: "Выберите пароль" - confirm_password: "Подтвердите пароль" - desired_login: "Предполагаемое имя пользователя" - destroy_confirmation: "Предупреждение: это действие удалит пользователя '%{login}', - все его действия, контексты, проекты и примечания. Продолжить?" - destroy_error: "Не удалось удалить пользователя %{login}" - destroy_successful: "Пользователь %{login} удален" - destroy_user: "Удалить пользователя" - failed_to_delete_user: "Не удалось удалить пользователя %{username}" - first_user_heading: "Добро пожаловать в TRACKS. Для начала, создайте учетную запись - Администратора:" + choose_password: Выберите пароль + confirm_password: Подтвердите пароль + desired_login: Предполагаемое имя пользователя + destroy_confirmation: 'Предупреждение: это действие удалит пользователя ''%{login}'', все его действия, контексты, проекты и примечания. Продолжить?' + destroy_error: Не удалось удалить пользователя %{login} + destroy_successful: Пользователь %{login} удален + destroy_user: Удалить пользователя + email_address: Email address + failed_to_delete_user: Не удалось удалить пользователя %{username} + first_user_heading: 'Добро пожаловать в TRACKS. Для начала, создайте учетную запись Администратора:' first_user_title: TRACKS::Войти как Администратор identity_url: URL идентификации - label_auth_type: "Тип авторизации" - manage_users: "Управление пользователями" - new_password_label: "Новый пароль" - new_token_generated: "Новый ключ успешно создан" - new_user_heading: "Создайте нового пользователя:" + label_auth_type: Тип авторизации + manage_users: Управление пользователями + new_password_label: Новый пароль + new_token_generated: Новый ключ успешно создан + new_user_heading: 'Создайте нового пользователя:' new_user_title: TRACKS::Вход no_signups_title: TRACKS::Нет регистрации - openid_ok_pref_failed: "Ваша ссылка %{url} подтверждена, но возникли проблемы - при сохранении настроек авторизации." - openid_url_verified: "Ваша ссылка %{url} подтверждена и установлена в качестве - авторизации с OpenID." - password_confirmation_label: "Подтверждение пароля" - password_updated: "пароль обновлен." - register_with_cas: "С вашим именем пользователя CAS" - select_authentication_type: "Выберите новый тип авторизации и нажмите 'Сменить - тип авторизации', чтобы заменить текущие настройки." - signup: "Регистрация" - signup_new_user: "Создать пользователя" - signup_successful: "Вход пользователя %{username} выполнен." - successfully_deleted_user: "Пользователь %{username} удален" - total_actions: "Всего действий" - total_contexts: "Всего контекстов" - total_notes: "Всего примечаний" - total_projects: "Всего проектов" - total_users_count: "Всего %{count} пользователей" - user_created: "Пользователь создан." - you_have_to_reset_your_password: "Вы сбросили свой пароль" + openid_ok_pref_failed: Ваша ссылка %{url} подтверждена, но возникли проблемы при сохранении настроек авторизации. + openid_url_verified: Ваша ссылка %{url} подтверждена и установлена в качестве авторизации с OpenID. + password_confirmation_label: Подтверждение пароля + password_updated: пароль обновлен. + register_with_cas: С вашим именем пользователя CAS + select_authentication_type: Выберите новый тип авторизации и нажмите 'Сменить тип авторизации', чтобы заменить текущие настройки. + signup: Регистрация + signup_new_user: Создать пользователя + signup_successful: Вход пользователя %{username} выполнен. + successfully_deleted_user: Пользователь %{username} удален + tos_link: read the Terms of Service + total_actions: Всего действий + total_contexts: Всего контекстов + total_notes: Всего примечаний + total_projects: Всего проектов + total_users_count: Всего %{count} пользователей + user_created: Пользователь создан. + you_have_to_reset_your_password: Вы сбросили свой пароль will_paginate: - next_label: "След →" + next_label: След → page_entries_info: - multi_page: "Отображено %{model} %{from} - %{to} из %{count}" - multi_page_html: "Отображено %{model} %{from} - %{to} из %{count}" + multi_page: Отображено %{model} %{from} - %{to} из %{count} + multi_page_html: Отображено %{model} %{from} - %{to} из %{count} single_page: + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} zero: "%{model} не найдено" - one: "Отображен 1 %{model}" - other: "Отображены все %{count} %{model}" single_page_html: + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} zero: "%{model} не найдено" - one: "Отображен 1 %{model}" - other: "Отображены все %{count} %{model}" page_gap: "…" previous_label: "← Пред" From 260efa06dff77eaa7e23764b8f32b02bdb7b4744 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 10 Oct 2020 01:21:13 +0300 Subject: [PATCH 204/767] Add CodeClimate configuration --- .codeclimate.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .codeclimate.yml diff --git a/.codeclimate.yml b/.codeclimate.yml new file mode 100644 index 00000000..96eba13f --- /dev/null +++ b/.codeclimate.yml @@ -0,0 +1,6 @@ +engines: + rubocop: + enabled: true + checks: + Rubocop/Style/StringLiterals: + enabled: false From 241477178fee62c8470195c876a1667b0ec31eb6 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 10 Oct 2020 01:37:05 +0300 Subject: [PATCH 205/767] Change Gemfile to use single quotes and update the lock file --- Gemfile | 62 ++++++++++++++++++++++++++-------------------------- Gemfile.lock | 12 +++++----- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index b2a2a052..4a31e12b 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,8 @@ gem 'coffee-rails', '~> 5.0.0' #gem 'json' # todo: remove xml api -gem "actionpack-xml_parser", "~> 2.0" -gem "activemodel-serializers-xml", "~> 1.0.1" +gem 'actionpack-xml_parser', '~> 2.0' +gem 'activemodel-serializers-xml', '~> 1.0.1' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer', group: :therubyracer @@ -22,17 +22,17 @@ gem 'jquery-ui-rails' , '~>6.0.1' # This will prevent a native build of the driver. Building native drivers is not # always possible on all platforms # Alternatively use --without arguments to bundler to not install that group -gem "sqlite3", group: :sqlite -gem "mysql2", "~> 0.5.3", group: :mysql -gem "pg", "~> 1.2.3", group: :postgresql +gem 'sqlite3', group: :sqlite +gem 'mysql2', '~> 0.5.3', group: :mysql +gem 'pg', '~> 1.2.3', group: :postgresql -gem "RedCloth" -gem "sanitize", "~> 5.2" -gem "will_paginate" -gem "acts_as_list" -gem "aasm", '~> 5.1.1' -gem "htmlentities" -gem "rails_autolink" +gem 'RedCloth' +gem 'sanitize', '~> 5.2' +gem 'will_paginate' +gem 'acts_as_list' +gem 'aasm', '~> 5.1.1' +gem 'htmlentities' +gem 'rails_autolink' gem 'puma', '~> 5.0' gem 'paperclip' @@ -47,18 +47,18 @@ gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # gem 'jbuilder', '~> 1.2' -gem "bootstrap-sass", "3.4.1" -gem "font-awesome-sass", "~> 5.13.0" +gem 'bootstrap-sass', '3.4.1' +gem 'font-awesome-sass', '~> 5.13.0' group :development do - gem "spring" - gem "yard" + gem 'spring' + gem 'yard' gem 'tolk', '~> 4.0.0' - gem "bullet" - gem "rack-mini-profiler" - gem "solargraph" + gem 'bullet' + gem 'rack-mini-profiler' + gem 'solargraph' gem 'i18n-tasks', '~> 0.9.31' end @@ -66,29 +66,29 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem "rubocop", "~> 0.93", require: false + gem 'rubocop', '~> 0.93', require: false end group :test do gem 'rails-controller-testing' gem 'rails-dom-testing', '~> 2.0.0' - gem "factory_bot_rails" - gem "rspec-expectations" - gem "database_cleaner" - gem "mocha", :require => false - gem "minitest-stub-const" + gem 'factory_bot_rails' + gem 'rspec-expectations' + gem 'database_cleaner' + gem 'mocha', :require => false + gem 'minitest-stub-const' - gem "selenium-webdriver", "~> 3.142" + gem 'selenium-webdriver', '~> 3.142' # uncomment to use the webkit option. This depends on Qt being installed - # gem "capybara-webkit" + # gem 'capybara-webkit' # uncomment to be able to make screenshots from scenarios - #gem "capybara-screenshot" - #gem "launchy" + #gem 'capybara-screenshot' + #gem 'launchy' - gem "simplecov" + gem 'simplecov' # get test coverage info on codeclimate - gem "codeclimate-test-reporter", "1.0.7", group: :test, require: nil + gem 'codeclimate-test-reporter', '1.0.7', group: :test, require: nil end diff --git a/Gemfile.lock b/Gemfile.lock index 40cc2d6f..4f739689 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM acts_as_list (1.0.2) activerecord (>= 4.2) ast (2.4.1) - autoprefixer-rails (9.4.7) + autoprefixer-rails (10.0.1.0) execjs backport (1.1.2) bcrypt (3.1.16) @@ -103,7 +103,7 @@ GEM concurrent-ruby (1.1.7) crass (1.0.6) database_cleaner (1.8.5) - diff-lcs (1.3) + diff-lcs (1.4.4) docile (1.3.2) e2mmap (0.1.0) erubi (1.9.0) @@ -152,9 +152,9 @@ GEM mimemagic (~> 0.3.2) maruku (0.7.3) method_source (1.0.0) - mime-types (3.1) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2020.0512) mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.4.0) @@ -245,7 +245,7 @@ GEM rubocop-ast (0.7.1) parser (>= 2.7.1.5) ruby-progressbar (1.10.1) - rubyzip (2.0.0) + rubyzip (2.3.0) safe_yaml (1.0.5) sanitize (5.2.1) crass (~> 1.0.2) @@ -265,7 +265,7 @@ GEM simplecov (0.19.0) docile (~> 1.1) simplecov-html (~> 0.11) - simplecov-html (0.12.2) + simplecov-html (0.12.3) solargraph (0.39.17) backport (~> 1.1) benchmark From d8acf600498f21276c79eea3d70c2a3fde5fb71b Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 10 Oct 2020 02:27:42 +0300 Subject: [PATCH 206/767] Code style fixes --- .codeclimate.yml | 12 ++ app/controllers/application_controller.rb | 34 ++--- app/controllers/calendar_controller.rb | 4 +- app/controllers/contexts_controller.rb | 27 ++-- app/controllers/data_controller.rb | 9 +- app/controllers/feedlist_controller.rb | 4 +- app/controllers/integrations_controller.rb | 2 - app/controllers/login_controller.rb | 39 +++-- app/controllers/mailgun_controller.rb | 2 - app/controllers/notes_controller.rb | 4 +- app/controllers/preferences_controller.rb | 4 +- app/controllers/projects_controller.rb | 41 +++-- .../recurring_todos/form_helper.rb | 16 +- app/controllers/recurring_todos_controller.rb | 8 +- app/controllers/search_controller.rb | 1 - app/controllers/stats_controller.rb | 30 ++-- .../todos/todo_create_params_helper.rb | 14 +- app/controllers/todos_controller.rb | 93 +++++------ app/controllers/users_controller.rb | 20 ++- app/helpers/application_helper.rb | 37 +++-- app/helpers/contexts_helper.rb | 2 - app/helpers/date_label_helper.rb | 7 - app/helpers/feedlist_helper.rb | 17 +-- app/helpers/icon_helper.rb | 2 +- app/helpers/login_helper.rb | 1 - app/helpers/preferences_helper.rb | 7 +- app/helpers/projects_helper.rb | 10 +- app/helpers/recurring_todos_helper.rb | 23 ++- app/helpers/rendering_helper.rb | 2 +- app/helpers/stats_helper.rb | 6 +- app/helpers/todos_helper.rb | 84 +++++----- app/helpers/users_helper.rb | 4 +- app/models/context.rb | 5 - app/models/dependency.rb | 8 +- app/models/message_gateway.rb | 1 - app/models/preference.rb | 7 +- app/models/project.rb | 8 +- app/models/recurring_todo.rb | 9 +- .../abstract_recurrence_pattern.rb | 8 +- .../abstract_recurring_todos_builder.rb | 54 +++---- .../daily_recurrence_pattern.rb | 5 +- .../daily_recurring_todos_builder.rb | 5 +- .../monthly_recurrence_pattern.rb | 2 - .../monthly_recurring_todos_builder.rb | 5 +- .../recurring_todos_builder.rb | 8 +- .../weekly_recurrence_pattern.rb | 11 +- .../weekly_recurring_todos_builder.rb | 7 +- .../yearly_recurrence_pattern.rb | 3 - .../yearly_recurring_todos_builder.rb | 3 - app/models/search/search_results.rb | 27 ++-- app/models/stats/actions.rb | 144 +++++++++--------- app/models/stats/chart.rb | 5 +- app/models/stats/contexts.rb | 2 +- app/models/stats/projects.rb | 3 +- app/models/stats/tag_cloud.rb | 4 +- app/models/stats/tag_cloud_query.rb | 13 +- app/models/stats/time_to_complete.rb | 7 +- app/models/stats/top_contexts_query.rb | 2 +- app/models/stats/top_projects_query.rb | 3 +- app/models/stats/totals.rb | 3 +- app/models/stats/user_stats.rb | 3 +- app/models/stats/user_tags_query.rb | 3 +- app/models/tag.rb | 2 - app/models/tagging.rb | 4 - app/models/todo.rb | 57 ++++--- app/models/todos/calendar.rb | 4 +- app/models/todos/undone_todos_query.rb | 4 +- app/models/user.rb | 17 +-- app/services/rich_message_extractor.rb | 1 - app/services/todo_from_rich_message.rb | 6 +- public/dispatch.fcgi | 20 +-- public/dispatch.rb | 3 +- 72 files changed, 458 insertions(+), 594 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 96eba13f..28469e82 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,6 +1,18 @@ engines: + brakeman: + enabled: true + fixme: + enabled: true + flog: + enabled: true + reek: + enabled: true rubocop: enabled: true checks: Rubocop/Style/StringLiterals: enabled: false + Rubocop/Style/TrailingCommaInLiteral: + enabled: false + Rubocop/Style/HashSyntax: + enabled: false diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1f2d62ad..3b955e39 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -60,7 +60,6 @@ class ApplicationController < ActionController::Base # Returns a count of next actions in the given context or project The result # is count and a string descriptor, correctly pluralised if there are no # actions or multiple actions - # def count_undone_todos_phrase(todos_parent) count = count_undone_todos(todos_parent) deferred_count = count_deferred_todos(todos_parent) @@ -83,13 +82,13 @@ class ApplicationController < ActionController::Base init_hidden_todo_counts(['context']) if !@context_hidden_todo_counts count = @context_hidden_todo_counts[todos_parent.id] else - count = eval "@#{todos_parent.class.to_s.downcase}_not_done_counts[#{todos_parent.id}]" + count = eval("@#{todos_parent.class.to_s.downcase}_not_done_counts[#{todos_parent.id}]", binding, __FILE__, __LINE__) end count || 0 end def count_deferred_todos(todos_parent) - return todos_parent.nil? ? 0 : eval("@#{todos_parent.class.to_s.downcase}_deferred_counts[#{todos_parent.id}]") || 0 + return todos_parent.nil? ? 0 : eval("@#{todos_parent.class.to_s.downcase}_deferred_counts[#{todos_parent.id}]", binding, __FILE__, __LINE__) || 0 end # Convert a date object to the format specified in the user's preferences in @@ -101,8 +100,8 @@ class ApplicationController < ActionController::Base def for_autocomplete(coll, substr) if substr # protect agains empty request - filtered = coll.find_all{|item| item.name.downcase.include? substr.downcase} - json_elems = Array[*filtered.map{ |e| {:id => e.id.to_s, :value => e.name} }].to_json + filtered = coll.find_all{ |item| item.name.downcase.include? substr.downcase } + json_elems = Array[*filtered.map{ |e| { :id => e.id.to_s, :value => e.name } }].to_json return json_elems else return "" @@ -110,7 +109,7 @@ class ApplicationController < ActionController::Base end def format_dependencies_as_json_for_auto_complete(entries) - json_elems = Array[*entries.map{ |e| {:value => e.id.to_s, :label => e.specification} }].to_json + json_elems = Array[*entries.map{ |e| { :value => e.id.to_s, :label => e.specification } }].to_json return json_elems end @@ -138,7 +137,7 @@ class ApplicationController < ActionController::Base end def handle_unverified_request - unless request.format=="application/xml" + unless request.format == "application/xml" super # handle xml http auth via our own login code end end @@ -204,7 +203,7 @@ class ApplicationController < ActionController::Base private - def parse_date_per_user_prefs( s ) + def parse_date_per_user_prefs(s) prefs.parse_date(s) end @@ -220,16 +219,16 @@ class ApplicationController < ActionController::Base end end - def init_not_done_counts(parents = ['project','context']) + def init_not_done_counts(parents=['project', 'context']) parents.each do |parent| - eval("@#{parent}_not_done_counts ||= current_user.todos.active.count_by_group('#{parent}_id')") - eval("@#{parent}_deferred_counts ||= current_user.todos.deferred.count_by_group('#{parent}_id')") + eval("@#{parent}_not_done_counts ||= current_user.todos.active.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__) + eval("@#{parent}_deferred_counts ||= current_user.todos.deferred.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__) end end - def init_hidden_todo_counts(parents = ['project', 'context']) + def init_hidden_todo_counts(parents=['project', 'context']) parents.each do |parent| - eval("@#{parent}_hidden_todo_counts ||= current_user.todos.active_or_hidden.count_by_group('#{parent}_id')") + eval("@#{parent}_hidden_todo_counts ||= current_user.todos.active_or_hidden.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__) end end @@ -252,9 +251,9 @@ class ApplicationController < ActionController::Base def todo_xml_params if params[:limit_fields] == 'index' - return [:only => [:id, :created_at, :updated_at, :completed_at] ] + return [:only => [:id, :created_at, :updated_at, :completed_at]] else - return [:except => :user_id, :include => [:tags, :predecessors, :successors] ] + return [:except => :user_id, :include => [:tags, :predecessors, :successors]] end end @@ -263,8 +262,8 @@ class ApplicationController < ActionController::Base @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). - paginate(:page => params[:page], :per_page => 20) + @done = object.todos.completed.reorder('completed_at DESC').includes(Todo::DEFAULT_INCLUDES) + .paginate(:page => params[:page], :per_page => 20) @count = @done.size render :template => 'todos/all_done' end @@ -284,5 +283,4 @@ class ApplicationController < ActionController::Base def set_group_view_by @group_view_by = params['_group_view_by'] || cookies['group_view_by'] || 'context' end - end diff --git a/app/controllers/calendar_controller.rb b/app/controllers/calendar_controller.rb index ae0680e3..7058104b 100644 --- a/app/controllers/calendar_controller.rb +++ b/app/controllers/calendar_controller.rb @@ -14,13 +14,13 @@ class CalendarController < ApplicationController respond_to do |format| format.html format.m { - cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } } format.ics { render :action => 'show', :layout => false, :content_type => Mime[:ics] } format.xml { - render :xml => @due_all.to_xml( *[todo_xml_params[0].merge({:root => :todos})] ) + render :xml => @due_all.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } end end diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb index b8feeb6e..fe660ce6 100644 --- a/app/controllers/contexts_controller.rb +++ b/app/controllers/contexts_controller.rb @@ -1,5 +1,4 @@ class ContextsController < ApplicationController - helper :todos before_action :init, :except => [:index, :create, :destroy, :order] @@ -19,15 +18,15 @@ class ContextsController < ApplicationController respond_to do |format| format.html &render_contexts_html - format.m &render_contexts_mobile - format.xml { render :xml => @all_contexts.to_xml(:root => :contexts, :except => :user_id) } + format.m &render_contexts_mobile + format.xml { render :xml => @all_contexts.to_xml(:root => :contexts, :except => :user_id) } format.any(:rss, :atom) do @feed_title = 'Tracks Contexts' @feed_description = "Lists all the contexts for #{current_user.display_name}" end format.text do # somehow passing Mime[:text] using content_type to render does not work - headers['Content-Type']=Mime[:text].to_s + headers['Content-Type'] = Mime[:text].to_s render :action => 'index', :layout => false, :content_type => Mime[:text] end format.autocomplete &render_autocomplete @@ -41,7 +40,7 @@ class ContextsController < ApplicationController @max_completed = current_user.prefs.show_number_completed @done = @context.todos.completed.limit(@max_completed).reorder(Arel.sql("todos.completed_at DESC, todos.created_at DESC")).includes(Todo::DEFAULT_INCLUDES) @not_done_todos = @context.todos.active_or_hidden.not_project_hidden.reorder(Arel.sql('todos.due IS NULL, todos.due ASC, todos.created_at ASC')).includes(Todo::DEFAULT_INCLUDES) - @todos_without_project = @not_done_todos.select{|t| t.project.nil?} + @todos_without_project = @not_done_todos.select{ |t| t.project.nil? } @deferred_todos = @context.todos.deferred.includes(Todo::DEFAULT_INCLUDES) @pending_todos = @context.todos.pending.includes(Todo::DEFAULT_INCLUDES) @@ -93,7 +92,6 @@ class ContextsController < ApplicationController end # Edit the details of the context - # def update process_params_for_update @@ -113,12 +111,12 @@ class ContextsController < ApplicationController respond_to do |format| format.js format.xml { - if @saved - render :xml => @context.to_xml( :except => :user_id ) - else - render :body => "Error on update: #{@context.errors.full_messages.inject("") {|v, e| v + e + " " }}", :status => 409 - end - } + if @saved + render :xml => @context.to_xml(:except => :user_id) + else + render :body => "Error on update: #{@context.errors.full_messages.inject("") { |v, e| v + e + " " }}", :status => 409 + end + } end end @@ -204,7 +202,7 @@ class ContextsController < ApplicationController @active_contexts = current_user.contexts.active @hidden_contexts = current_user.contexts.hidden @down_count = @active_contexts.size + @hidden_contexts.size - cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } render end end @@ -214,7 +212,7 @@ class ContextsController < ApplicationController @page_title = "TRACKS::List actions in "+@context.name @not_done = @not_done_todos.select {|t| t.context_id == @context.id } @down_count = @not_done.size - cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } @mobile_from_context = @context.id render end @@ -270,5 +268,4 @@ class ContextsController < ApplicationController return false end end - end diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb index 32d751c8..e0444fd8 100644 --- a/app/controllers/data_controller.rb +++ b/app/controllers/data_controller.rb @@ -1,5 +1,4 @@ class DataController < ApplicationController - require 'csv' def index @@ -7,7 +6,6 @@ class DataController < ApplicationController end def import - end def csv_map @@ -147,8 +145,7 @@ class DataController < ApplicationController def csv_notes content_type = 'text/csv' CSV.generate(result = "") do |csv| - csv << ["id", "User ID", "Project", "Note", - "Created at", "Updated at"] + csv << ["id", "User ID", "Project", "Note", "Created at", "Updated at"] # had to remove project include because it's association order is leaking # through and causing an ambiguous column ref even with_exclusive_scope # didn't seem to help -JamesKebinger @@ -198,7 +195,7 @@ class DataController < ApplicationController # adjusts time to utc def adjust_time(timestring) - if (timestring=='') or ( timestring == nil) + if (timestring == '') or (timestring == nil) return nil else return Time.parse(timestring + 'UTC') @@ -210,8 +207,8 @@ class DataController < ApplicationController end private + def sanitize_filename(filename) filename.gsub(/[^0-9A-z.\-]/, '_') end - end diff --git a/app/controllers/feedlist_controller.rb b/app/controllers/feedlist_controller.rb index e4f24dda..8b6b1578 100644 --- a/app/controllers/feedlist_controller.rb +++ b/app/controllers/feedlist_controller.rb @@ -1,5 +1,4 @@ class FeedlistController < ApplicationController - helper :feedlist def index @@ -37,9 +36,8 @@ class FeedlistController < ApplicationController def get_feeds_for(object) respond_to do |format| - format.html { render :file => "feedlist/get_feeds_for_#{object.class.name.downcase}"} + format.html { render :file => "feedlist/get_feeds_for_#{object.class.name.downcase}" } format.js end end - end diff --git a/app/controllers/integrations_controller.rb b/app/controllers/integrations_controller.rb index a4fa3c67..dd2b841e 100644 --- a/app/controllers/integrations_controller.rb +++ b/app/controllers/integrations_controller.rb @@ -59,6 +59,4 @@ class IntegrationsController < ApplicationController return result end - end - diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index e0a97b8d..ec6c7c30 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -28,7 +28,7 @@ class LoginController < ApplicationController end respond_to do |format| format.html - format.m { render :action => 'login', :layout => 'mobile' } + format.m { render :action => 'login', :layout => 'mobile' } end end @@ -44,7 +44,7 @@ class LoginController < ApplicationController return unless should_expire_sessions? # Get expiry time (allow ten seconds window for the case where we have none) time_left = expiry_time - Time.now - @session_expired = ( time_left < (10*60) ) # Session will time out before the next check + @session_expired = ( time_left < (10 * 60) ) # Session will time out before the next check end end respond_to do |format| @@ -54,25 +54,25 @@ class LoginController < ApplicationController private - def handle_post_success - session['user_id'] = @user.id - # If checkbox on login page checked, we don't expire the session after 1 hour - # of inactivity and we remember this user for future browser sessions - session['noexpiry'] = params['user_noexpiry'] - msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire." - notify :notice, "Login successful: session #{msg}" - cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] } - unless should_expire_sessions? - @user.remember_me - cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] } - end - redirect_back_or_home + def handle_post_success + session['user_id'] = @user.id + # If checkbox on login page checked, we don't expire the session after 1 hour + # of inactivity and we remember this user for future browser sessions + session['noexpiry'] = params['user_noexpiry'] + msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire." + notify :notice, "Login successful: session #{msg}" + cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] } + unless should_expire_sessions? + @user.remember_me + cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] } end + redirect_back_or_home + end - def handle_post_failure - @login = params['user_login'] - notify :warning, t('login.unsuccessful') - end + def handle_post_failure + @login = params['user_login'] + notify :warning, t('login.unsuccessful') + end def should_expire_sessions? session['noexpiry'] != "on" @@ -82,5 +82,4 @@ class LoginController < ApplicationController return Time.now + 10 unless session['expiry_time'] DateTime.strptime(session['expiry_time'], "%FT%T.%L%Z") end - end diff --git a/app/controllers/mailgun_controller.rb b/app/controllers/mailgun_controller.rb index 50c929a4..0618a5a2 100644 --- a/app/controllers/mailgun_controller.rb +++ b/app/controllers/mailgun_controller.rb @@ -1,7 +1,6 @@ require 'openssl' class MailgunController < ApplicationController - skip_before_action :login_required, :only => [:mailgun] before_action :verify, :only => [:mailgun] protect_from_forgery with: :null_session @@ -34,5 +33,4 @@ class MailgunController < ApplicationController return end end - end diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 0b60bd6a..ef44c114 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -1,5 +1,4 @@ class NotesController < ApplicationController - before_action :set_source_view def index @@ -9,7 +8,7 @@ class NotesController < ApplicationController @source_view = 'note_list' respond_to do |format| format.html - format.xml { render :xml => @all_notes.to_xml(:root => :notes, :except => :user_id ) } + format.xml { render :xml => @all_notes.to_xml(:root => :notes, :except => :user_id) } end end @@ -75,5 +74,4 @@ class NotesController < ApplicationController def note_params params.require(:note).permit(:project_id, :body) end - end diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb index b391ab9c..96e36c6a 100644 --- a/app/controllers/preferences_controller.rb +++ b/app/controllers/preferences_controller.rb @@ -1,5 +1,4 @@ class PreferencesController < ApplicationController - def index @page_title = t('preferences.page_title') @prefs = current_user.prefs @@ -31,7 +30,7 @@ class PreferencesController < ApplicationController render :body => l(Date.current, :format => format) end -private + private def prefs_params params.require(:prefs).permit( @@ -52,5 +51,4 @@ private notify :notice, t('preferences.updated') redirect_to :action => 'index' end - end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ee9f151a..c572575c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -1,5 +1,4 @@ class ProjectsController < ApplicationController - helper :application, :todos, :notes before_action :set_source_view before_action :set_project_from_params, :only => [:update, :destroy, :show, :edit, :set_reviewed] @@ -16,14 +15,14 @@ class ProjectsController < ApplicationController init_not_done_counts(['project']) init_hidden_todo_counts(['project']) if params[:only_active_with_no_next_actions] - @projects = current_user.projects.active.select { |p| count_undone_todos(p) == 0 } + @projects = current_user.projects.active.select { |p| count_undone_todos(p) == 0 } else @projects = current_user.projects end @active_projects = current_user.projects.active @hidden_projects = current_user.projects.hidden respond_to do |format| - format.html do + format.html do @page_title = t('projects.list_projects') @count = current_user.projects.count @completed_projects = current_user.projects.completed.limit(10) @@ -32,7 +31,7 @@ class ProjectsController < ApplicationController current_user.projects.cache_note_counts @new_project = current_user.projects.build end - format.m do + format.m do @completed_projects = current_user.projects.completed @down_count = @active_projects.size + @hidden_projects.size + @completed_projects.size cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} @@ -58,9 +57,9 @@ class ProjectsController < ApplicationController @source_view = params['_source_view'] || 'review' @page_title = t('projects.list_reviews') projects = current_user.projects - @projects_to_review = projects.select {|p| p.needs_review?(current_user)} - @stalled_projects = projects.select {|p| p.stalled?} - @blocked_projects = projects.select {|p| p.blocked?} + @projects_to_review = projects.select { |p| p.needs_review?(current_user) } + @stalled_projects = projects.select { |p| p.stalled? } + @blocked_projects = projects.select { |p| p.blocked? } @current_projects = projects.uncompleted.select { |p| not (p.needs_review?(current_user)) }.sort_by { |p| p.last_reviewed || Time.zone.at(0) } init_not_done_counts(['project']) @@ -85,7 +84,7 @@ class ProjectsController < ApplicationController @total = current_user.projects.completed.count @no_projects = @projects.empty? - @range_low = (page.to_i-1) * items_per_page + 1 + @range_low = (page.to_i - 1) * items_per_page + 1 @range_high = @range_low + @projects.size - 1 @range_low = 0 if @total == 0 @@ -115,7 +114,7 @@ class ProjectsController < ApplicationController respond_to do |format| format.text { # somehow passing Mime[:text] using content_type to render does not work - headers['Content-Type']=Mime[:text].to_s + headers['Content-Type'] = Mime[:text].to_s render :action => 'index_text_projects_and_actions', :layout => false, :content_type => Mime[:text] } end @@ -133,13 +132,13 @@ class ProjectsController < ApplicationController @projects_to_show = [@project] @done = {} - @done = @project.todos.completed. - reorder("todos.completed_at DESC"). - limit(current_user.prefs.show_number_completed). - includes(Todo::DEFAULT_INCLUDES) unless @max_completed == 0 + @done = @project.todos.completed + .reorder("todos.completed_at DESC") + .limit(current_user.prefs.show_number_completed) + .includes(Todo::DEFAULT_INCLUDES) unless @max_completed == 0 @down_count = @not_done_todos.size + @deferred_todos.size + @pending_todos.size - @count=@down_count + @count = @down_count @next_project = current_user.projects.next_from(@project) @previous_project = current_user.projects.previous_from(@project) @default_tags = @project.default_tags @@ -148,16 +147,16 @@ class ProjectsController < ApplicationController @contexts = current_user.contexts respond_to do |format| format.html - format.m do + format.m do if @project.default_context.nil? @project_default_context = t('projects.no_default_context') else @project_default_context = t('projects.default_context', :context => @project.default_context.name) end - cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } @mobile_from_project = @project.id end - format.xml do + format.xml do render :xml => @project.to_xml(:root => :project, :except => :user_id) { |xml| xml.not_done { @not_done_todos.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } } xml.deferred { @deferred_todos.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } } @@ -192,12 +191,11 @@ class ProjectsController < ApplicationController head :created, :location => project_url(@project), :text => @project.id end end - format.html {redirect_to :action => 'index'} + format.html { redirect_to :action => 'index' } end end # Edit the details of the project - # def update template = "" @@ -252,7 +250,7 @@ class ProjectsController < ApplicationController if @saved render :xml => @project.to_xml( :except => :user_id ) else - render :body => "Error on update: #{@project.errors.full_messages.inject("") {|v, e| v + e + " " }}", :status => 409 + render :body => "Error on update: #{@project.errors.full_messages.inject("") { |v, e| v + e + " " }}", :status => 409 end } end @@ -280,7 +278,7 @@ class ProjectsController < ApplicationController def order project_ids = params["container_project"] - @projects = current_user.projects.update_positions( project_ids ) + @projects = current_user.projects.update_positions(project_ids) head :ok rescue notify :error, $! @@ -350,5 +348,4 @@ class ProjectsController < ApplicationController def project_params params.require(:project).permit(:name, :position, :user_id, :description, :state, :default_context_id, :default_tags) end - end diff --git a/app/controllers/recurring_todos/form_helper.rb b/app/controllers/recurring_todos/form_helper.rb index adbdff7d..f7bbe962 100644 --- a/app/controllers/recurring_todos/form_helper.rb +++ b/app/controllers/recurring_todos/form_helper.rb @@ -1,18 +1,16 @@ module RecurringTodos - class FormHelper - def initialize(recurring_todo) @recurring_todo = recurring_todo @method_map = { # delegate daily_xxx to daily_pattern.xxx - "daily" => {prefix: "", method: daily_pattern}, - "weekly" => {prefix: "", method: weekly_pattern}, - "monthly" => {prefix: "", method: monthly_pattern}, - "yearly" => {prefix: "", method: yearly_pattern}, + "daily" => { prefix: "", method: daily_pattern }, + "weekly" => { prefix: "", method: weekly_pattern }, + "monthly" => { prefix: "", method: monthly_pattern }, + "yearly" => { prefix: "", method: yearly_pattern }, # delegate on_xxx to weekly_pattern.on_xxx - "on" => {prefix: "on_", method: weekly_pattern} + "on" => { prefix: "on_", method: weekly_pattern } } end @@ -47,7 +45,5 @@ module RecurringTodos # no match, let @recurring_todo handle it, or fail @recurring_todo.send(method, *args) end - end - -end \ No newline at end of file +end diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb index 05ab6878..9283459f 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -1,5 +1,4 @@ class RecurringTodosController < ApplicationController - helper :todos, :recurring_todos append_before_action :init, :only => [:index, :new, :edit, :create] @@ -34,7 +33,7 @@ class RecurringTodosController < ApplicationController @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => page, :per_page => items_per_page @total = @count = current_user.recurring_todos.completed.count - @range_low = (page.to_i-1) * items_per_page + 1 + @range_low = (page.to_i - 1) * items_per_page + 1 @range_high = @range_low + @completed_recurring_todos.size - 1 @range_low = 0 if @total == 0 @@ -98,7 +97,6 @@ class RecurringTodosController < ApplicationController @completed_remaining = current_user.recurring_todos.completed.count respond_to do |format| - format.html do if @saved notify :notice, t('todos.recurring_deleted_success') @@ -107,7 +105,6 @@ class RecurringTodosController < ApplicationController end redirect_to :action => 'index' end - format.js do render end @@ -165,7 +162,7 @@ class RecurringTodosController < ApplicationController # derived attributes :weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday, :weekly_return_thursday, :weekly_return_friday, :weekly_return_saturday, :weekly_return_sunday - ) + ) end def all_recurring_todo_params @@ -230,5 +227,4 @@ class RecurringTodosController < ApplicationController where("fai_todos.id IS NULL"). each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! } end - end diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 98fae72a..ff9541e4 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,5 +1,4 @@ class SearchController < ApplicationController - helper :todos, :application, :notes, :projects, :contexts def results diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 39b1c908..1a8e6c39 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -1,6 +1,5 @@ class StatsController < ApplicationController - - SECONDS_PER_DAY = 86400; + SECONDS_PER_DAY = 86_400; helper :todos, :projects, :recurring_todos append_before_action :init, :except => :index @@ -31,15 +30,15 @@ class StatsController < ApplicationController @max = (@actions_done_last_months_array + @actions_created_last_months_array).max # set running avg - @actions_done_avg_last_months_array = compute_running_avg_array(@actions_done_last_months_array,month_count+1) - @actions_created_avg_last_months_array = compute_running_avg_array(@actions_created_last_months_array,month_count+1) + @actions_done_avg_last_months_array = compute_running_avg_array(@actions_done_last_months_array,month_count + 1) + @actions_created_avg_last_months_array = compute_running_avg_array(@actions_created_last_months_array,month_count + 1) # interpolate avg for this month. @interpolated_actions_created_this_month = interpolate_avg_for_current_month(@actions_created_last_months_array) @interpolated_actions_done_this_month = interpolate_avg_for_current_month(@actions_done_last_months_array) - @created_count_array = Array.new(month_count+1, actions_last_months.select { |x| x.created_at }.size/month_count) - @done_count_array = Array.new(month_count+1, actions_last_months.select { |x| x.completed_at }.size/month_count) + @created_count_array = Array.new(month_count + 1, actions_last_months.select { |x| x.created_at }.size / month_count) + @done_count_array = Array.new(month_count + 1, actions_last_months.select { |x| x.completed_at }.size / month_count) render :layout => false end @@ -52,7 +51,6 @@ class StatsController < ApplicationController case params['id'] when 'avrt', 'avrt_end' # actions_visible_running_time - # HACK: because open flash chart uses & to denote the end of a parameter, # we cannot use URLs with multiple parameters (that would use &). So we # revert to using two id's for the same selection. avtr_end means that the @@ -72,11 +70,11 @@ class StatsController < ApplicationController end # get all running actions that are visible - @actions_running_time = current_user.todos.not_completed.not_hidden.not_deferred_or_blocked. - select("todos.id, todos.created_at"). - reorder("todos.created_at DESC") + @actions_running_time = current_user.todos.not_completed.not_hidden.not_deferred_or_blocked + .select("todos.id, todos.created_at") + .reorder("todos.created_at DESC") - selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id']== 'avrt_end') + selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id'] == 'avrt_end') @selected_actions = selected_todo_ids.size == 0 ? [] : current_user.todos.where("id in (" + selected_todo_ids.join(",") + ")") @count = @selected_actions.size @@ -84,7 +82,7 @@ class StatsController < ApplicationController when 'art', 'art_end' week_from = params['index'].to_i - week_to = week_from+1 + week_to = week_from + 1 @chart = Stats::Chart.new('actions_running_time_data') @page_title = "Actions selected from week " @@ -99,7 +97,7 @@ class StatsController < ApplicationController # get all running actions @actions_running_time = current_user.todos.not_completed.select("id, created_at") - selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id']=='art_end') + selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id'] == 'art_end') @selected_actions = selected_todo_ids.size == 0 ? [] : current_user.todos.where("id in (#{selected_todo_ids.join(",")})") @count = @selected_actions.size @@ -145,7 +143,7 @@ class StatsController < ApplicationController if at_end selected_todo_ids << r.id.to_s if weeks >= week_from else - selected_todo_ids << r.id.to_s if weeks.between?(week_from, week_to-1) + selected_todo_ids << r.id.to_s if weeks.between?(week_from, week_to - 1) end end @@ -161,12 +159,12 @@ class StatsController < ApplicationController end def put_events_into_month_buckets(records, array_size, date_method_on_todo) - convert_to_array(records.select { |x| x.send(date_method_on_todo) }, array_size) { |r| [difference_in_months(@today, r.send(date_method_on_todo))]} + convert_to_array(records.select { |x| x.send(date_method_on_todo) }, array_size) { |r| [difference_in_months(@today, r.send(date_method_on_todo))] } end # assumes date1 > date2 def difference_in_days(date1, date2) - return ((date1.utc.at_midnight-date2.utc.at_midnight)/SECONDS_PER_DAY).to_i + return ((date1.utc.at_midnight - date2.utc.at_midnight) / SECONDS_PER_DAY).to_i end # assumes date1 > date2 diff --git a/app/controllers/todos/todo_create_params_helper.rb b/app/controllers/todos/todo_create_params_helper.rb index 32d1baab..98c22cdb 100644 --- a/app/controllers/todos/todo_create_params_helper.rb +++ b/app/controllers/todos/todo_create_params_helper.rb @@ -1,6 +1,5 @@ module Todos class TodoCreateParamsHelper - attr_reader :new_project_created, :new_context_created, :attributes def initialize(params, user) @@ -85,7 +84,7 @@ module Todos end def sequential? - return @params[:todos_sequential].present? && @params[:todos_sequential]=='true' + return @params[:todos_sequential].present? && @params[:todos_sequential] == 'true' end def specified_by_name?(group_type) @@ -110,7 +109,7 @@ module Todos end def add_errors(model) - @errors.each {|e| model.errors.add(e[:attribute], e[:message]) } + @errors.each { |e| model.errors.add(e[:attribute], e[:message]) } end private @@ -124,7 +123,7 @@ module Todos # accept empty :todo hash if params[:todo].empty? - params[:todo] = {:ignore => true} + params[:todo] = { :ignore => true } end filtered = params.require(:todo).permit( @@ -136,7 +135,7 @@ module Todos :project => [:name]) # add back :predecessor_dependencies - filtered[:predecessor_dependencies] = {:predecessor => deps } unless deps.nil? + filtered[:predecessor_dependencies] = { :predecessor => deps } unless deps.nil? filtered end @@ -157,9 +156,8 @@ module Todos # be aware, this will replace the project_id/context_id (string) in @attributes with the new found id (int) @attributes["#{group_type}_id"] = set.find(id).id return false - rescue - @errors << { :attribute => group_type, :message => "unknown"} + rescue + @errors << { :attribute => group_type, :message => "unknown" } end - end end diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 776f92f9..aa4a3c08 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -1,5 +1,4 @@ class TodosController < ApplicationController - skip_before_action :login_required, :only => [:index, :tag, :list_deferred, :show, :list_hidden, :done] prepend_before_action :login_or_feed_token_required, :only => [:index, :tag, :list_deferred, :show, :list_hidden, :done] append_before_action :find_and_activate_ready, :only => [:index, :list_deferred] @@ -35,29 +34,29 @@ class TodosController < ApplicationController @done = current_user.todos.completed.limit(max_completed).includes(Todo::DEFAULT_INCLUDES) unless max_completed == 0 respond_to do |format| - format.html do + format.html do @page_title = t('todos.task_list_title') # Set count badge to number of not-done, not hidden context items @count = current_user.todos.active.not_hidden.count(:all) - @todos_without_project = @not_done_todos.select{|t|t.project.nil?} + @todos_without_project = @not_done_todos.select{ |t| t.project.nil? } end format.m do @page_title = t('todos.mobile_todos_page_title') @home = true - cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } determine_down_count render :action => 'index'.freeze end format.text do # somehow passing Mime[:text] using content_type to render does not work - headers['Content-Type'.freeze]=Mime[:text].to_s + headers['Content-Type'.freeze] = Mime[:text].to_s render :content_type => Mime[:text] end format.xml do @xml_todos = params[:limit_to_active_todos] ? @not_done_todos : @todos - render :xml => @xml_todos.to_xml( *[todo_xml_params[0].merge({:root => :todos})] ) + render :xml => @xml_todos.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) end format.any(:rss, :atom) do @feed_title = 'Tracks Actions'.freeze @@ -73,7 +72,7 @@ class TodosController < ApplicationController respond_to do |format| format.m { @new_mobile = true - @return_path=cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path + @return_path = cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path @mobile_from_context = current_user.contexts.find(params[:from_context]) if params[:from_context] @mobile_from_project = current_user.projects.find(params[:from_project]) if params[:from_project] if params[:from_project] && !params[:from_context] @@ -123,7 +122,7 @@ class TodosController < ApplicationController redirect_to :action => "index" end format.m do - @return_path=cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path + @return_path = cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path if @saved onsite_redirect_to @return_path else @@ -176,7 +175,7 @@ class TodosController < ApplicationController # first build all todos and check if they would validate on save params[:todo][:multiple_todos].split("\n").map do |line| if line.present? #ignore blank lines - @todo = current_user.todos.build({:description => line, :context_id => p.context_id, :project_id => p.project_id}) + @todo = current_user.todos.build({ :description => line, :context_id => p.context_id, :project_id => p.project_id }) validates &&= @todo.valid? @build_todos << @todo @@ -250,7 +249,7 @@ class TodosController < ApplicationController @projects = current_user.projects.active @contexts = current_user.contexts @edit_mobile = true - @return_path=cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path + @return_path = cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path } end end @@ -259,7 +258,7 @@ class TodosController < ApplicationController @todo = current_user.todos.find(params['id']) respond_to do |format| format.m { render :action => 'show' } - format.xml { render :xml => @todo.to_xml( *[todo_xml_params[0].merge({:root => :todo})] ) } + format.xml { render :xml => @todo.to_xml( *[todo_xml_params[0].merge({ :root => :todo })] ) } end end @@ -363,7 +362,7 @@ class TodosController < ApplicationController if @saved if cookies[:mobile_url] old_path = cookies[:mobile_url] - cookies[:mobile_url] = {:value => nil, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url] = { :value => nil, :secure => SITE_CONFIG['secure_cookies'] } notify(:notice, t("todos.action_marked_complete", :description => @todo.description, :completed => @todo.completed? ? 'complete' : 'incomplete')) onsite_redirect_to old_path else @@ -384,11 +383,11 @@ class TodosController < ApplicationController respond_to do |format| format.js format.xml { render :xml => @todo.to_xml( *todo_xml_params ) } - format.html { redirect_to request.referrer} + format.html { redirect_to request.referrer } format.m { if cookies[:mobile_url] old_path = cookies[:mobile_url] - cookies[:mobile_url] = {:value => nil, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url] = { :value => nil, :secure => SITE_CONFIG['secure_cookies'] } notify(:notice, "Star toggled") onsite_redirect_to old_path else @@ -456,7 +455,7 @@ class TodosController < ApplicationController end determine_changes_by_this_update - determine_remaining_in_container_count( (@context_changed || @project_changed) ? @original_item : @todo) + determine_remaining_in_container_count((@context_changed || @project_changed) ? @original_item : @todo) determine_down_count determine_deferred_tag_count(sanitize(params['_tag_name'])) if source_view_is(:tag) @@ -519,7 +518,6 @@ class TodosController < ApplicationController @new_recurring_todo = check_for_next_todo(@todo) if @saved respond_to do |format| - format.html do if @saved message = t('todos.action_deleted_success') @@ -533,7 +531,6 @@ class TodosController < ApplicationController redirect_to :action => 'index' end end - format.js do if @saved determine_down_count @@ -546,9 +543,7 @@ class TodosController < ApplicationController end render end - format.xml { render :body => '200 OK. Action deleted.', :status => 200 } - end end @@ -563,7 +558,7 @@ class TodosController < ApplicationController format.html format.xml do completed_todos = current_user.todos.completed - render :xml => completed_todos.to_xml( *[todo_xml_params[0].merge({:root => :todos})] ) + render :xml => completed_todos.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) end end end @@ -583,7 +578,7 @@ class TodosController < ApplicationController @contexts_to_show = @contexts = current_user.contexts @projects_to_show = @projects = current_user.projects - includes = params[:format]=='xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES + includes = params[:format] == 'xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES @not_done_todos = current_user.todos.deferred.includes(includes).reorder('show_from') + current_user.todos.pending.includes(includes) @todos_without_project = @not_done_todos.select{|t|t.project.nil?} @@ -596,7 +591,7 @@ class TodosController < ApplicationController init_data_for_sidebar unless mobile? end format.m - format.xml { render :xml => @not_done_todos.to_xml( *[todo_xml_params[0].merge({:root => :todos})] ) } + format.xml { render :xml => @not_done_todos.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } end end @@ -646,14 +641,14 @@ class TodosController < ApplicationController blocked. reorder(Arel.sql('todos.show_from ASC, todos.created_at DESC')). includes(Todo::DEFAULT_INCLUDES) - @todos_without_project = @not_done_todos.select{|t| t.project.nil?} + @todos_without_project = @not_done_todos.select{ |t| t.project.nil? } # If you've set no_completed to zero, the completed items box isn't shown on # the tag page - @done = todos_with_tag_ids.completed. - limit(current_user.prefs.show_number_completed). - reorder('todos.completed_at DESC'). - includes(Todo::DEFAULT_INCLUDES) + @done = todos_with_tag_ids.completed + .limit(current_user.prefs.show_number_completed) + .reorder('todos.completed_at DESC') + .includes(Todo::DEFAULT_INCLUDES) @projects = current_user.projects @contexts = current_user.contexts @@ -670,7 +665,7 @@ class TodosController < ApplicationController respond_to do |format| format.html format.m { - cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } } format.text { render :action => 'index', :layout => false, :content_type => Mime[:text] @@ -705,7 +700,6 @@ class TodosController < ApplicationController @tag = Tag.where(:name => @tag_name).first_or_create end - def tags tags_beginning = current_user.tags.where(Tag.arel_table[:name].matches("#{params[:term]}%")) tags_all = current_user.tags.where(Tag.arel_table[:name].matches("%#{params[:term]}%")) @@ -747,7 +741,7 @@ class TodosController < ApplicationController respond_to do |format| format.html { redirect_to :back } - format.js {render :action => 'update'} + format.js { render :action => 'update' } format.m { notify(:notice, t("todos.action_deferred", :description => @todo.description)) do_mobile_todo_redirection @@ -759,20 +753,20 @@ class TodosController < ApplicationController @hidden = current_user.todos.hidden respond_to do |format| format.xml { - render :xml => @hidden.to_xml( *[todo_xml_params[0].merge({:root => :todos})] ) + render :xml => @hidden.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } end end def get_not_completed_for_predecessor(relation, todo_id=nil) - items = relation.todos.not_completed. - where('(LOWER(todos.description) ' + Common.like_operator + '?)', "%#{params[:term].downcase}%") + items = relation.todos.not_completed + .where('(LOWER(todos.description) ' + Common.like_operator + '?)', "%#{params[:term].downcase}%") items = items.where("AND NOT(todos.id=?)", todo_id) unless todo_id.nil? - items. - includes(:context, :project). - reorder('description ASC'). - limit(10) + items + .includes(:context, :project) + .reorder('description ASC') + .limit(10) end def auto_complete_for_predecessor @@ -805,12 +799,12 @@ class TodosController < ApplicationController def show_notes @todo = current_user.todos.find(params['id']) - @return_path=cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path + @return_path = cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path respond_to do |format| format.html { redirect_to home_path, "Viewing note of todo is not implemented" } - format.m { + format.m { render :action => "show_notes" } end @@ -839,7 +833,7 @@ class TodosController < ApplicationController def do_mobile_todo_redirection if cookies[:mobile_url] old_path = cookies[:mobile_url] - cookies[:mobile_url] = {:value => nil, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url] = { :value => nil, :secure => SITE_CONFIG['secure_cookies'] } onsite_redirect_to old_path else onsite_redirect_to todos_path(:format => 'm') @@ -990,7 +984,7 @@ end return todos_in_container, todos_in_target_container end - def determine_remaining_in_container_count(todo = @todo) + def determine_remaining_in_container_count(todo=@todo) source_view do |from| from.deferred { todos_in_container, todos_in_target_container = find_todos_in_container_and_target_container(todo, @todo) @@ -1060,7 +1054,7 @@ end end def determine_completed_count - todos=nil + todos = nil source_view do |from| from.todo { todos = current_user.todos.not_hidden.completed } @@ -1096,7 +1090,6 @@ end date_to_check ||= Time.zone.now if recurring_todo.active? && recurring_todo.continues_recurring?(date_to_check) - # shift the reference date to yesterday if date_to_check is furher in # the past. This is to make sure we do not get older todos for overdue # todos. I.e. checking a daily todo that is overdue with 5 days will @@ -1104,7 +1097,7 @@ end # date. Discard the time part in the compare. We pick yesterday so # that new todos due for today will be created instead of new todos # for tomorrow. - date = date_to_check.at_midnight >= Time.zone.now.at_midnight ? date_to_check : Time.zone.now-1.day + date = date_to_check.at_midnight >= Time.zone.now.at_midnight ? date_to_check : Time.zone.now - 1.day new_recurring_todo = TodoFromRecurringTodo.new(current_user, recurring_todo).create(date) end @@ -1179,7 +1172,6 @@ end end end - def update_context @context_changed = false if params['todo']['context_id'].blank? && params['context_name'].present? @@ -1218,7 +1210,7 @@ end end def update_due_and_show_from_dates - %w{ due show_from }.each {|date| update_date_for_update(date) } + %w{ due show_from }.each { |date| update_date_for_update(date) } end def update_completed_state @@ -1290,22 +1282,22 @@ end end # all completed todos [today@00:00, today@now] - def get_done_today(completed_todos, includes = {:include => Todo::DEFAULT_INCLUDES}) + def get_done_today(completed_todos, includes={ :include => Todo::DEFAULT_INCLUDES }) start_of_this_day = Time.zone.now.beginning_of_day completed_todos.completed_after(start_of_this_day).includes(includes[:include]) end - def get_done_in_period(completed_todos, 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}) + def get_done_rest_of_week(completed_todos, includes={ :include => Todo::DEFAULT_INCLUDES }) 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}) + def get_done_rest_of_month(completed_todos, includes={ :include => Todo::DEFAULT_INCLUDES }) get_done_in_period(completed_todos, Time.zone.now.beginning_of_week, Time.zone.now.beginning_of_month) end @@ -1322,5 +1314,4 @@ end redirect_to(uri.path) end end - end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 01d13fc1..56ca40d2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,9 +1,8 @@ class UsersController < ApplicationController - - before_action :admin_login_required, :only => [ :index, :show ] - before_action :admin_or_self_login_required, :only => [ :destroy ] - skip_before_action :login_required, :only => [ :new, :create ] - prepend_before_action :login_optional, :only => [ :new, :create ] + before_action :admin_login_required, :only => [:index, :show] + before_action :admin_or_self_login_required, :only => [:destroy] + skip_before_action :login_required, :only => [:new, :create] + prepend_before_action :login_optional, :only => [:new, :create] # GET /users GET /users.xml def index @@ -17,8 +16,8 @@ class UsersController < ApplicationController store_location end format.xml do - @users = User.order('login') - render :xml => @users.to_xml(:root => :users, :except => [ :password ]) + @users = User.order('login') + render :xml => @users.to_xml(:root => :users, :except => [:password]) end end end @@ -26,16 +25,16 @@ class UsersController < ApplicationController # GET /users/id GET /users/id.xml def show @user = User.find(params[:id]) - render :xml => @user.to_xml(:root => :user, :except => [ :password ]) + render :xml => @user.to_xml(:root => :user, :except => [:password]) end # GET /users/new def new @auth_types = [] unless session[:cas_user] - Tracks::Config.auth_schemes.each {|auth| @auth_types << [auth,auth]} + Tracks::Config.auth_schemes.each { |auth| @auth_types << [auth, auth] } else - @auth_types << ['cas','cas'] + @auth_types << ['cas', 'cas'] end if User.no_users_yet? @@ -223,5 +222,4 @@ class UsersController < ApplicationController return false if params[:user][:password].empty? return true end - end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bdbb831f..225b45ae 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -10,7 +10,7 @@ module ApplicationHelper link_to( t("layouts.navigation.group_view_by_#{menu_name}"), '#', - {:id => "group_view_by_link", :accesskey => "g", :title => t('layouts.navigation.group_view_by_title'), :x_current_group_by => @group_view_by} ) + { :id => "group_view_by_link", :accesskey => "g", :title => t('layouts.navigation.group_view_by_title'), :x_current_group_by => @group_view_by } ) end end @@ -18,7 +18,7 @@ module ApplicationHelper link_to( image_tag("blank.png", :alt => t('common.collapse_expand')), "#", - {:class => "container_toggle", :id => id} ) + { :class => "container_toggle", :id => id }) end # Check due date in comparison to today's date Flag up date appropriately with @@ -54,28 +54,28 @@ module ApplicationHelper end def link_to_context(context, descriptor = sanitize(context.name)) - link_to( descriptor, context, :title => "View context: #{context.name}" ) + link_to(descriptor, context, :title => "View context: #{context.name}") end def link_to_project(project, descriptor = sanitize(project.name)) - link_to( descriptor, project, :title => "View project: #{project.name}" ) + link_to(descriptor, project, :title => "View project: #{project.name}") end def link_to_edit_note (note, descriptor = sanitize(note.id.to_s)) link_to(descriptor, edit_note_path(note), - {:id => "link_edit_#{dom_id(note)}", :class => "note_edit_settings"}) + { :id => "link_edit_#{dom_id(note)}", :class => "note_edit_settings" }) end def link_to_project_mobile(project, accesskey, descriptor = sanitize(project.name)) - link_to( descriptor, project_path(project, :format => 'm'), {:title => "View project: #{project.name}", :accesskey => accesskey} ) + link_to(descriptor, project_path(project, :format => 'm'), { :title => "View project: #{project.name}", :accesskey => accesskey }) end def item_link_to_context(item) - link_to_context( item.context, prefs.verbose_action_descriptors ? "[#{item.context.name}]" : "[C]" ) + link_to_context(item.context, prefs.verbose_action_descriptors ? "[#{item.context.name}]" : "[C]") end def item_link_to_project(item) - link_to_project( item.project, prefs.verbose_action_descriptors ? "[#{item.project.name}]" : "[P]" ) + link_to_project(item.project, prefs.verbose_action_descriptors ? "[#{item.project.name}]" : "[P]") end def render_flash @@ -127,15 +127,15 @@ module ApplicationHelper end def sidebar_html_for_titled_list (list, title) - return content_tag(:h3, title+" (#{list.size})") + content_tag(:ul, sidebar_html_for_list(list)) + return content_tag(:h3, title+" (#{list.size})") + content_tag(:ul, sidebar_html_for_list(list)) end def link_to_sidebar_item(item) - item.is_a?(Project) ? link_to_project( item ) : link_to_context( item ) + item.is_a?(Project) ? link_to_project(item) : link_to_context(item) end def sidebar_html_for_item(item) - content_tag(:li, link_to_sidebar_item(item) + " (" + count_undone_todos_phrase(item)+")") + content_tag(:li, link_to_sidebar_item(item) + " (" + count_undone_todos_phrase(item) + ")") end def sidebar_html_for_list(list) @@ -175,12 +175,12 @@ module ApplicationHelper def done_path(controller_name, type) case controller_name when "contexts" - send("#{type}_todos_context_path",@context) + send("#{type}_todos_context_path", @context) when "projects" send("#{type}_todos_project_path", @project) when "todos" if @tag_name - send("#{type}_tag_path",@tag_name) + send("#{type}_tag_path", @tag_name) else send("#{type}_todos_path") end @@ -199,7 +199,7 @@ module ApplicationHelper def get_list_of_error_messages_for(model) if model.errors.any? - content_tag(:div, {:id=>"errorExplanation"}) do + content_tag(:div, { :id => "errorExplanation" }) do content_tag(:ul) do model.errors.full_messages.collect { |msg| concat(content_tag(:li, msg)) } end @@ -207,10 +207,8 @@ module ApplicationHelper end end - def link_to_delete(type, object, descriptor = sanitize(object.name)) - link_to( - descriptor, - self.send("#{type}_path", object, :format => 'js'), + def link_to_delete(type, object, descriptor=sanitize(object.name)) + link_to(descriptor, self.send("#{type}_path", object, :format => 'js'), { :id => "delete_#{type}_#{object.id}", :class => "delete_#{type}_button icon", @@ -239,7 +237,7 @@ module ApplicationHelper "#{name}_#{SecureRandom.hex(5)}" end - def js_render(partial, locals = {}, object=nil) + def js_render(partial, locals={}, object=nil) if object escape_javascript(render(partial: partial, locals: locals, object: object)) else @@ -250,5 +248,4 @@ module ApplicationHelper def js_error_messages_for(object) escape_javascript(get_list_of_error_messages_for(object)) end - end diff --git a/app/helpers/contexts_helper.rb b/app/helpers/contexts_helper.rb index 40636bbd..472b968b 100644 --- a/app/helpers/contexts_helper.rb +++ b/app/helpers/contexts_helper.rb @@ -1,5 +1,4 @@ module ContextsHelper - def show_context_name(context) if source_view_is :context content_tag(:span, :id => "context_name"){context.name} @@ -19,5 +18,4 @@ module ContextsHelper def context_summary(context, undone_todo_count) content_tag(:p, "#{undone_todo_count}. Context is #{context.hidden? ? 'Hidden' : 'Active'}.".html_safe) end - end diff --git a/app/helpers/date_label_helper.rb b/app/helpers/date_label_helper.rb index 7bff81d8..68b5435c 100644 --- a/app/helpers/date_label_helper.rb +++ b/app/helpers/date_label_helper.rb @@ -1,5 +1,4 @@ module DateLabelHelper - class GenericDateView include ActionView::Context include ActionView::Helpers @@ -66,11 +65,9 @@ module DateLabelHelper yield } end - end class DueDateView < GenericDateView - def due_text case @days_sym when :overdue_by_one @@ -100,11 +97,9 @@ module DateLabelHelper def due_date_mobile_html date_mobile_html_wrapper { @prefs.format_date(@due) } end - end class ShowFromDateView < GenericDateView - def show_from_text case @days_sym when :overdue_by_more_than_one, :overdue_by_one @@ -127,7 +122,5 @@ module DateLabelHelper def show_from_date_html date_html_wrapper { show_from_text } end - end - end diff --git a/app/helpers/feedlist_helper.rb b/app/helpers/feedlist_helper.rb index 3a5ce17a..9f42a1fd 100644 --- a/app/helpers/feedlist_helper.rb +++ b/app/helpers/feedlist_helper.rb @@ -1,7 +1,6 @@ module FeedlistHelper - def linkoptions(format, options) - merge_hashes( {:format => format}, options, user_token_hash) + merge_hashes( { :format => format }, options, user_token_hash) end def rss_formatted_link(options = {}) @@ -10,25 +9,25 @@ module FeedlistHelper end def text_formatted_link(options = {}) - link_to(content_tag(:span, 'TXT', {:class => 'feed', :title => "Plain text feed"}), linkoptions('txt', options)) + link_to(content_tag(:span, 'TXT', { :class => 'feed', :title => "Plain text feed" }), linkoptions('txt', options)) end def ical_formatted_link(options = {}) - link_to(content_tag(:span, 'iCal', {:class=>"feed", :title => "iCal feed"}), linkoptions('ics', options)) + link_to(content_tag(:span, 'iCal', { :class=>"feed", :title => "iCal feed" }), linkoptions('ics', options)) end def feed_links(feeds, link_options, title) space = " " html = "" - html << rss_formatted_link(link_options) +space if feeds.include?(:rss) - html << text_formatted_link(link_options)+space if feeds.include?(:txt) - html << ical_formatted_link(link_options)+space if feeds.include?(:ical) + html << rss_formatted_link(link_options) + space if feeds.include?(:rss) + html << text_formatted_link(link_options) + space if feeds.include?(:txt) + html << ical_formatted_link(link_options) + space if feeds.include?(:ical) html << title return html.html_safe end def all_feed_links(object, symbol) - feed_links([:rss, :txt, :ical], { :controller=> 'todos', :action => 'index', symbol => object.to_param }, content_tag(:strong, object.name)) + feed_links([:rss, :txt, :ical], { :controller => 'todos', :action => 'index', symbol => object.to_param }, content_tag(:strong, object.name)) end def all_feed_links_for_project(project) @@ -48,6 +47,4 @@ module FeedlistHelper def user_token_hash { :token => current_user.token } end - - end diff --git a/app/helpers/icon_helper.rb b/app/helpers/icon_helper.rb index 108a9e9b..c35ed8f6 100644 --- a/app/helpers/icon_helper.rb +++ b/app/helpers/icon_helper.rb @@ -1,7 +1,7 @@ module IconHelper include FontAwesome::Sass::Rails::ViewHelpers - def icon_fw(style, name, text = nil, html_options = {}) + def icon_fw(style, name, text=nil, html_options={}) text, html_options = nil, text if text.is_a?(Hash) if html_options.key?(:class) diff --git a/app/helpers/login_helper.rb b/app/helpers/login_helper.rb index 4b4d6e71..a0418e32 100644 --- a/app/helpers/login_helper.rb +++ b/app/helpers/login_helper.rb @@ -1,3 +1,2 @@ module LoginHelper - end diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index 4ba46e2f..5c49f88b 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -1,5 +1,4 @@ module PreferencesHelper - def pref(model, pref_name, &block) s = content_tag(:label, Preference.human_attribute_name(pref_name), :for => model + "_" + pref_name) s << yield @@ -10,7 +9,7 @@ module PreferencesHelper pref(model, pref_name) { check_box(model, pref_name, class: "form-control") } end - def pref_with_select_field(model, pref_name, collection = [ [t('preferences.is_true'),true], [t('preferences.is_false'), false] ]) + def pref_with_select_field(model, pref_name, collection = [[t('preferences.is_true'), true], [t('preferences.is_false'), false]]) pref(model, pref_name) { select(model, pref_name, collection, {}, class: "form-control") } end @@ -21,8 +20,8 @@ module PreferencesHelper def profile_delete_user(user) return link_to( t('users.destroy_user'), - url_for({:controller => 'users', :action => 'destroy', :id => user.id}), - {:id => "delete_user_#{user.id}", + url_for({ :controller => 'users', :action => 'destroy', :id => user.id }), + { :id => "delete_user_#{user.id}", :class => "delete_user_button btn btn-danger", :title => t('users.destroy_user'), :x_confirm_message => t('users.destroy_confirmation', :login => user.login) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 40175c54..2ce15824 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -1,5 +1,4 @@ module ProjectsHelper - def show_project_name(project) if source_view_is :project content_tag(:span, :id => "project_name"){project.name} @@ -9,7 +8,7 @@ module ProjectsHelper end def show_project_settings(project) - content_tag(:div, :id => dom_id(project, "container"), :class=>"list") do + content_tag(:div, :id => dom_id(project, "container"), :class => "list") do render :partial => "projects/project_settings", :object => project end end @@ -27,9 +26,9 @@ module ProjectsHelper def project_next_prev_mobile prev_project = "" next_project = "" - prev_project = content_tag(:li, link_to_project_mobile(@previous_project, "5", @previous_project.shortened_name), :class=>"prev") if @previous_project - next_project = content_tag(:li, link_to_project_mobile(@next_project, "6", @next_project.shortened_name), :class=>"next") if @next_project - return content_tag(:ul, "#{prev_project}#{next_project}".html_safe, :class=>"next-prev-project") + prev_project = content_tag(:li, link_to_project_mobile(@previous_project, "5", @previous_project.shortened_name), :class => "prev") if @previous_project + next_project = content_tag(:li, link_to_project_mobile(@next_project, "6", @next_project.shortened_name), :class => "next") if @next_project + return content_tag(:ul, "#{prev_project}#{next_project}".html_safe, :class => "next-prev-project") end def project_summary(project) @@ -52,5 +51,4 @@ module ProjectsHelper def link_to_edit_project (project, descriptor = sanitize(project.name)) link_to_edit(:project, project, descriptor) end - end diff --git a/app/helpers/recurring_todos_helper.rb b/app/helpers/recurring_todos_helper.rb index c9ade8cd..7f6fe459 100644 --- a/app/helpers/recurring_todos_helper.rb +++ b/app/helpers/recurring_todos_helper.rb @@ -1,28 +1,27 @@ module RecurringTodosHelper - def recurring_todo_tag_list - tags_except_starred = @recurring_todo.tags.reject{|t| t.name == Todo::STARRED_TAG_NAME} - tag_list = tags_except_starred. - collect{|t| content_tag(:span,link_to(t.name, tag_path(t.name)), :class => "tag #{t.label}")}. - join('') + tags_except_starred = @recurring_todo.tags.reject{ |t| t.name == Todo::STARRED_TAG_NAME } + tag_list = tags_except_starred + .collect{ |t| content_tag(:span,link_to(t.name, tag_path(t.name)), :class => "tag #{t.label}") } + .join('') return content_tag :span, tag_list.html_safe, :class => "tags" end def recurring_todo_remote_delete_icon - link_to( image_tag_for_delete, - recurring_todo_path(@recurring_todo), :id => "delete_icon_"+@recurring_todo.id.to_s, + link_to(image_tag_for_delete, recurring_todo_path(@recurring_todo), + :id => "delete_icon_" + @recurring_todo.id.to_s, :class => "icon delete_icon", :title => t('todos.delete_recurring_action_title'), :x_confirm_message => t('todos.delete_recurring_action_confirm', :description => @recurring_todo.description)) end def recurring_todo_remote_star_icon - link_to( image_tag_for_star(@recurring_todo), - toggle_star_recurring_todo_path(@recurring_todo), :id => "star_icon_"+@recurring_todo.id.to_s, + link_to(image_tag_for_star(@recurring_todo), + toggle_star_recurring_todo_path(@recurring_todo), :id => "star_icon_" + @recurring_todo.id.to_s, :class => "icon star_item", :title => t('todos.star_action')) end def recurring_todo_remote_edit_icon if !@recurring_todo.completed? - str = link_to( image_tag_for_edit(@recurring_todo), + str = link_to(image_tag_for_edit(@recurring_todo), edit_recurring_todo_path(@recurring_todo), :class => "icon edit_icon", :id => "link_edit_recurring_todo_#{@recurring_todo.id}") else @@ -38,10 +37,10 @@ module RecurringTodosHelper private def image_tag_for_delete - image_tag("blank.png", :title =>t('todos.delete_action'), :class=>"delete_item") + image_tag("blank.png", :title => t('todos.delete_action'), :class => "delete_item") end def image_tag_for_edit(todo) - image_tag("blank.png", :title =>t('todos.edit_action'), :class=>"edit_item", :id=> dom_id(todo, 'edit_icon')) + image_tag("blank.png", :title => t('todos.edit_action'), :class => "edit_item", :id => dom_id(todo, 'edit_icon')) end end diff --git a/app/helpers/rendering_helper.rb b/app/helpers/rendering_helper.rb index 76166bfa..56f304d0 100644 --- a/app/helpers/rendering_helper.rb +++ b/app/helpers/rendering_helper.rb @@ -29,7 +29,7 @@ module RenderingHelper # add onenote and message protocols, allow a target a_href_config = relaxed_config[:protocols]['a']['href'] + %w(onenote message) a_attributes = relaxed_config[:attributes]['a'] + ['target'] - config = Sanitize::Config.merge(config, protocols: {'a' => {'href' => a_href_config}}, :attributes => {'a' => a_attributes}) + config = Sanitize::Config.merge(config, protocols: { 'a' => { 'href' => a_href_config } }, :attributes => { 'a' => a_attributes }) rendered = Sanitize.fragment(rendered, config) return rendered.html_safe diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb index 94e93ae2..3adaf850 100644 --- a/app/helpers/stats_helper.rb +++ b/app/helpers/stats_helper.rb @@ -1,11 +1,10 @@ module StatsHelper - def font_size(cloud, tag) 9 + 2 * cloud.relative_size(tag) end def month_and_year_label(i) - t('date.month_names')[ (Time.zone.now.mon - i -1 ) % 12 + 1 ]+ " " + (Time.zone.now - i.months).year.to_s + t('date.month_names')[(Time.zone.now.mon - i - 1) % 12 + 1] + " " + (Time.zone.now - i.months).year.to_s end def array_of_month_and_year_labels(count) @@ -13,11 +12,10 @@ module StatsHelper end def month_label(i) - t('date.month_names')[ (Time.zone.now.mon - i -1 ) % 12 + 1 ] + t('date.month_names')[(Time.zone.now.mon - i - 1) % 12 + 1] end def array_of_month_labels(count) Array.new(count) { |i| month_label(i) } end - end diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 47475a86..a82e1ed5 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -1,9 +1,7 @@ require 'staleness' module TodosHelper - # === helpers for rendering container - def empty_message_holder(container_name, show, title_param=nil) content_tag(:div, :id => "no_todos_in_view", :class => "container #{container_name}", :style => "display:" + (show ? "block" : "none") ) do content_tag(:h2) { t("todos.no_actions.title", :param=>title_param) } + @@ -14,7 +12,7 @@ module TodosHelper end def todos_container_empty_message(container_name, container_id, show_message) - content_tag(:div, :id=>"#{container_id}-empty-d", :style=>"display:#{show_message ? 'block' : 'none'}") do + content_tag(:div, :id => "#{container_id}-empty-d", :style => "display:#{show_message ? 'block' : 'none'}") do content_tag(:div, :class=>"message") do content_tag(:p) do t("todos.no_actions.#{container_name}") @@ -49,7 +47,7 @@ module TodosHelper render :partial => 'todos/collection', :object => done_todos, - :locals => {:settings => settings.reverse_merge!(default_collection_settings)} + :locals => { :settings => settings.reverse_merge!(default_collection_settings) } end def show_completed_todos_for(period, collection) @@ -62,7 +60,7 @@ module TodosHelper render :partial => "todos/collection", :object => collection, - :locals => { :settings => settings} + :locals => { :settings => settings } end def show_hidden_todos(hidden_todos, settings={}) @@ -70,7 +68,7 @@ module TodosHelper render :partial => 'todos/collection', :object => hidden_todos, - :locals => {:settings => settings.reverse_merge!(default_collection_settings)} + :locals => { :settings => settings.reverse_merge!(default_collection_settings) } end def show_deferred_pending_todos(deferred_todos, pending_todos, settings={}) @@ -79,13 +77,13 @@ module TodosHelper render :partial => "todos/collection", :object => deferred_todos+pending_todos, - :locals => {:settings => settings.reverse_merge!(default_collection_settings)} + :locals => { :settings => settings.reverse_merge!(default_collection_settings) } end def show_todos_without_project(todos_without_project, settings = {}) render :partial => 'todos/collection', :object => todos_without_project, - :locals => {:settings => settings.reverse_merge!({ + :locals => { :settings => settings.reverse_merge!({ :collapsible => true, :container_name => "without_project", :parent_container_type => "home" @@ -104,8 +102,8 @@ module TodosHelper end content_tag(:div, - :class=>settings[:class], - :id=>settings[:id], + :class => settings[:class], + :id => settings[:id], :style => "display:" + (settings[:show_container] ? "block" : "none")) do yield end @@ -129,7 +127,7 @@ module TodosHelper # do not pass :class to partial locals settings.delete(:class) - content_tag(:div, :id =>settings[:id]+"_items", :class=>"items toggle_target") do + content_tag(:div, :id => settings[:id] + "_items", :class => "items toggle_target") do todos_container_empty_message(settings[:container_name], settings[:id], collection.empty?) + render(:partial => "todos/todo", :collection => collection, :locals => settings) end @@ -138,19 +136,18 @@ module TodosHelper def todos_calendar_container(period, collection) render :partial => 'todos/collection', :object => collection, - :locals => {:settings => { + :locals => { :settings => { :collapsible => false, :show_empty_containers => true, :container_name => "#{period}", :title =>t("todos.calendar.#{period}", :month => l(Time.zone.now, :format => "%B"), :next_month => l(1.month.from_now, :format => "%B")) - } - } + } } end # === helpers for rendering a todo def remote_star_icon(todo=@todo) - link_to( image_tag_for_star(todo), + link_to(image_tag_for_star(todo), toggle_star_todo_path(todo), :class => "icon star_item", :title => t('todos.star_action_with_description', :description => todo.description)) end @@ -167,7 +164,7 @@ module TodosHelper def remote_delete_menu_item(todo) return link_to( t('todos.delete'), - {:controller => 'todos', :action => 'destroy', :id => todo.id}, + { :controller => 'todos', :action => 'destroy', :id => todo.id }, :class => "icon_delete_item", :id => dom_id(todo, "delete"), :x_confirm_message => t('todos.confirm_delete', :description => todo.description), @@ -175,11 +172,11 @@ module TodosHelper end def remote_defer_menu_item(days, todo) - url = {:controller => 'todos', :action => 'defer', :id => todo.id, :days => days, - :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")} + url = { :controller => 'todos', :action => 'defer', :id => todo.id, :days => days, + :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "") } url[:_tag_name] = @tag_name if @source_view == 'tag' - options = {:x_defer_alert => false, :class => "icon_defer_item icon_defer_#{days}_item", :id => "defer_#{days}_#{dom_id(todo)}" } + options = { :x_defer_alert => false, :class => "icon_defer_item icon_defer_#{days}_item", :id => "defer_#{days}_#{dom_id(todo)}" } if todo.due futuredate = (todo.show_from || todo.user.date) + days.days if futuredate.at_midnight > todo.due.at_midnight @@ -204,32 +201,32 @@ module TodosHelper :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")} url[:_tag_name] = @tag_name if @source_view == 'tag' - link_to(t('todos.convert_to_project'), url, {:class => "icon_item_to_project", :id => dom_id(todo, "to_project")}) + link_to(t('todos.convert_to_project'), url, { :class => "icon_item_to_project", :id => dom_id(todo, "to_project") }) end def attachment_image(todo) link_to( image_tag('blank.png', width: 16, height: 16, border:0), todo.attachments.first.file.url, - {:class => 'todo_attachment', title: 'Get attachments of this todo'} + { :class => 'todo_attachment', title: 'Get attachments of this todo' } ) end def collapsed_notes_image(todo) link = link_to( - image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), + image_tag( 'blank.png', :width => '16', :height => '16', :border => '0' ), "#", - {:class => 'show_notes', :title => 'Show notes'}) + { :class => 'show_notes', :title => 'Show notes' }) notes = content_tag(:div, { :class => "todo_notes", :id => dom_id(todo, 'notes'), - :style => "display:none"}) { raw render_text(todo.notes) } + :style => "display:none" }) { raw render_text(todo.notes) } return link+notes end def collapsed_successors_image(todo) - link = link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_successors', :title => 'Show successors'}) - successors = content_tag(:div, {:class => "todo_successors", :id => dom_id(todo, 'successors'), :style => "display:none"}) do + link = link_to(image_tag('blank.png', :width => '16', :height => '16', :border => '0' ), "#", { :class => 'show_successors', :title => 'Show successors' }) + successors = content_tag(:div, { :class => "todo_successors", :id => dom_id(todo, 'successors'), :style => "display:none" }) do render :partial => "todos/successor", :collection => todo.pending_successors, :locals => { :parent_container_type => parent_container_type, :suppress_dependencies => true, :predecessor => todo } end @@ -244,7 +241,7 @@ module TodosHelper end def image_tag_for_star(todo) - image_tag("blank.png", :title =>t('todos.star_action'), :class => "todo_star"+(todo.starred? ? " starred":""), :id => "star_img_"+todo.id.to_s) + image_tag("blank.png", :title => t('todos.star_action'), :class => "todo_star" + (todo.starred? ? " starred" : ""), :id => "star_img_" + todo.id.to_s) end def remote_toggle_checkbox(todo=@todo) @@ -260,14 +257,14 @@ module TodosHelper def date_span(todo=@todo) if todo.completed? - content_tag(:span, {:class => :grey}) { format_date( todo.completed_at ) } + content_tag(:span, { :class => :grey }) { format_date( todo.completed_at ) } elsif todo.pending? title = t('todos.depends_on')+ ": " + todo.uncompleted_predecessors.to_a.map(&:description).join(', ') - content_tag(:a, {:title => title}) { content_tag(:span, {:class => :orange}) { t('todos.pending') } } + content_tag(:a, { :title => title }) { content_tag(:span, { :class => :orange }) { t('todos.pending') } } elsif todo.deferred? - show_date( todo.show_from ) + show_date(todo.show_from) else - due_date( todo.due ) + due_date(todo.due) end end @@ -275,7 +272,7 @@ module TodosHelper unless todo.pending_successors.empty? pending_count = todo.pending_successors.count title = "#{t('todos.has_x_pending', :count => pending_count)}: #{todo.pending_successors.to_a.map(&:description).join(', ')}" - image_tag( 'successor_off.png', :width=>'10', :height=>'16', :border=>'0', :title => title ) + image_tag('successor_off.png', :width => '10', :height => '16', :border => '0', :title => title) end end @@ -291,12 +288,12 @@ module TodosHelper todo.tags.to_a.join(', ') end - def tag_span (tag, mobile=false) + def tag_span(tag, mobile=false) content_tag(:span, :class => "tag #{tag.label}") { link_to(tag.name, tag_path(tag.name, :format => mobile ? :m : nil)) } end def tag_list(todo=@todo, mobile=false) - content_tag(:span, :class => 'tags') { todo.tags.all_except_starred.collect{|tag| tag_span(tag, mobile)}.join('').html_safe } + content_tag(:span, :class => 'tags') { todo.tags.all_except_starred.collect{ |tag| tag_span(tag, mobile) }.join('').html_safe } end def tag_list_mobile(todo=@todo) @@ -310,11 +307,11 @@ module TodosHelper def project_and_context_links(todo, parent_container_type, opts = {}) links = '' if todo.completed? - links << item_link_to_context( todo ) unless opts[:suppress_context] - links << item_link_to_project( todo ) unless opts[:suppress_project] || todo.project.nil? + links << item_link_to_context(todo) unless opts[:suppress_context] + links << item_link_to_project(todo) unless opts[:suppress_project] || todo.project.nil? else - links << item_link_to_context( todo ) if include_context_link(todo, parent_container_type) - links << item_link_to_project( todo ) if include_project_link(todo, parent_container_type) + links << item_link_to_context(todo) if include_context_link(todo, parent_container_type) + links << item_link_to_project(todo) if include_project_link(todo, parent_container_type) end links.html_safe @@ -364,7 +361,7 @@ module TodosHelper end def date_field_tag(name, id, value = nil, options = {}) - text_field_tag name, value, {"size" => 12, "id" => id, "class" => "Date", "autocomplete" => "off"}.update(options.stringify_keys) + text_field_tag name, value, { "size" => 12, "id" => id, "class" => "Date", "autocomplete" => "off" }.update(options.stringify_keys) end def sort_key(todo) @@ -484,11 +481,11 @@ module TodosHelper def todo_moved_out_of_container # moved from one project container to another - moved_project = @project_changed && @group_view_by=='project' + moved_project = @project_changed && @group_view_by == 'project' # moved from one context container to another - moved_context = @context_changed && @group_view_by=='context' + moved_context = @context_changed && @group_view_by == 'context' # moved from actions-without-project container to another - moved_without_project = @context_changed && @group_view_by=='project' && @todo.project_id.nil? + moved_without_project = @context_changed && @group_view_by == 'project' && @todo.project_id.nil? return moved_project || moved_context || moved_without_project end @@ -557,7 +554,7 @@ module TodosHelper page.deferred { return todo_moved_out_of_container && (@todo.deferred? || @todo.pending?) } page.calendar { return @due_date_changed && @todo.due } page.stats { return false } - page.tag { return update_needs_to_remove_todo_from_container && !@tag_was_removed} + page.tag { return update_needs_to_remove_todo_from_container && !@tag_was_removed } page.todo { return todo_moved_out_of_container && !(@todo.deferred? || @todo.pending? || @todo.hidden?) } end return false @@ -684,5 +681,4 @@ module TodosHelper end return container_id.blank? ? "" : "$(\"##{container_id}\").slideDown(100);".html_safe end - end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 8f4db7bd..8fdbf5ed 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,9 +1,9 @@ module UsersHelper def remote_delete_user(user) return link_to( - image_tag("blank.png", :title =>t('users.destroy_user'), :class=>"delete_item"), + image_tag("blank.png", :title => t('users.destroy_user'), :class => "delete_item"), url_for({:controller => 'users', :action => 'destroy', :id => user.id}), - {:id => "delete_user_#{user.id}", + { :id => "delete_user_#{user.id}", :class => "delete_user_button", :title => t('users.destroy_user'), :x_confirm_message => t('users.destroy_confirmation', :login => user.login) diff --git a/app/models/context.rb b/app/models/context.rb index 7461e730..407f15e9 100644 --- a/app/models/context.rb +++ b/app/models/context.rb @@ -1,5 +1,4 @@ class Context < ApplicationRecord - has_many :todos, -> { order(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")).includes(:project) }, :dependent => :delete_all has_many :recurring_todos, :dependent => :delete_all belongs_to :user @@ -15,7 +14,6 @@ class Context < ApplicationRecord include AASM aasm :column => :state do - state :active, :initial => true state :closed state :hidden @@ -48,11 +46,9 @@ class Context < ApplicationRecord def no_active_todos? return todos.active.count == 0 end - end class NullContext - def nil? true end @@ -64,5 +60,4 @@ class NullContext def name '' end - end diff --git a/app/models/dependency.rb b/app/models/dependency.rb index 3a89bd18..7664b910 100644 --- a/app/models/dependency.rb +++ b/app/models/dependency.rb @@ -1,17 +1,13 @@ class Dependency < ApplicationRecord - # touch to make sure todo caches for predecessor and successor are invalidated - belongs_to :predecessor, :foreign_key => 'predecessor_id', :class_name => 'Todo', :touch => true - belongs_to :successor, :foreign_key => 'successor_id', :class_name => 'Todo', :touch => true + belongs_to :successor, :foreign_key => 'successor_id', :class_name => 'Todo', :touch => true validate :check_circular_dependencies def check_circular_dependencies - unless predecessor.nil? or successor.nil? + unless predecessor.nil? || successor.nil? errors.add("Depends on:", "Adding '#{successor.specification}' would create a circular dependency") if successor.is_successor?(predecessor) end end - end - diff --git a/app/models/message_gateway.rb b/app/models/message_gateway.rb index de60e8df..8d66913b 100644 --- a/app/models/message_gateway.rb +++ b/app/models/message_gateway.rb @@ -1,5 +1,4 @@ class MessageGateway < ActionMailer::Base - def receive(email) user = get_receiving_user_from_email_address(email) return false if user.nil? diff --git a/app/models/preference.rb b/app/models/preference.rb index 2666a13a..79f279bb 100644 --- a/app/models/preference.rb +++ b/app/models/preference.rb @@ -3,11 +3,11 @@ class Preference < ApplicationRecord belongs_to :sms_context, :class_name => 'Context' def self.themes - { :black => 'black', :light_blue => 'light_blue'} + { :black => 'black', :light_blue => 'light_blue' } end def self.due_styles - { :due_in_n_days => 0, :due_on => 1} + { :due_in_n_days => 0, :due_on => 1 } end def hide_completed_actions? @@ -29,8 +29,7 @@ class Preference < ApplicationRecord date.in_time_zone(time_zone).beginning_of_day end - def format_date (date) + def format_date(date) return date ? date.in_time_zone(time_zone).strftime("#{date_format}") : '' end - end diff --git a/app/models/project.rb b/app/models/project.rb index 675cbb45..47b52bfd 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1,6 +1,6 @@ class Project < ApplicationRecord - has_many :todos, -> {order(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC"))}, dependent: :delete_all - has_many :notes, -> {order "created_at DESC"}, dependent: :delete_all + has_many :todos, -> { order(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) }, dependent: :delete_all + has_many :notes, -> { order "created_at DESC" }, dependent: :delete_all has_many :recurring_todos belongs_to :default_context, :class_name => "Context", :foreign_key => "default_context_id" @@ -25,7 +25,6 @@ class Project < ApplicationRecord include AASM aasm :column => :state do - state :active, :initial => true state :hidden state :completed, :enter => :set_completed_at_date, :exit => :clear_completed_at_date @@ -145,11 +144,9 @@ class Project < ApplicationRecord end count end - end class NullProject - def hidden? false end @@ -169,5 +166,4 @@ class NullProject def persisted? false end - end diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb index 2c082fbf..0816a48c 100644 --- a/app/models/recurring_todo.rb +++ b/app/models/recurring_todo.rb @@ -5,8 +5,8 @@ class RecurringTodo < ApplicationRecord has_many :todos - scope :active, -> { where state: 'active'} - scope :completed, -> { where state: 'completed'} + scope :active, -> { where state: 'active' } + scope :completed, -> { where state: 'completed' } include IsTaggable @@ -27,7 +27,7 @@ class RecurringTodo < ApplicationRecord validates_presence_of :description, :recurring_period, :target, :ends_on, :context validates_length_of :description, :maximum => 100 - validates_length_of :notes, :maximum => 60000, :allow_nil => true + validates_length_of :notes, :maximum => 60_000, :allow_nil => true validate :period_validation validate :pattern_specific_validations @@ -72,7 +72,7 @@ class RecurringTodo < ApplicationRecord def pattern if valid_period? - @pattern = eval("RecurringTodos::#{recurring_period.capitalize}RecurrencePattern.new(user)") + @pattern = eval("RecurringTodos::#{recurring_period.capitalize}RecurrencePattern.new(user)", binding, __FILE__, __LINE__) @pattern.build_from_recurring_todo(self) end @pattern @@ -138,5 +138,4 @@ class RecurringTodo < ApplicationRecord def continues_recurring?(previous) pattern.continues_recurring?(previous) end - end diff --git a/app/models/recurring_todos/abstract_recurrence_pattern.rb b/app/models/recurring_todos/abstract_recurrence_pattern.rb index d7a8baad..e2c2364d 100644 --- a/app/models/recurring_todos/abstract_recurrence_pattern.rb +++ b/app/models/recurring_todos/abstract_recurrence_pattern.rb @@ -1,7 +1,5 @@ module RecurringTodos - class AbstractRecurrencePattern - attr_accessor :attributes def initialize(user) @@ -147,7 +145,7 @@ module RecurringTodos # checks if the next todos should be put in the tickler for recurrence_target == 'due_date' def put_in_tickler? - !( show_always? || show_from_delta.nil?) + !(show_always? || show_from_delta.nil?) end def get_next_date(previous) @@ -207,14 +205,14 @@ module RecurringTodos end def find_xth_day_of_month(x, weekday, month, year) - start = Time.zone.local(year,month,1) + start = Time.zone.local(year, month, 1) n = x while n > 0 while start.wday() != weekday start += 1.day end n -= 1 - start += 1.day unless n==0 + start += 1.day unless n == 0 end start end diff --git a/app/models/recurring_todos/abstract_recurring_todos_builder.rb b/app/models/recurring_todos/abstract_recurring_todos_builder.rb index 5c367d14..4d39cc54 100644 --- a/app/models/recurring_todos/abstract_recurring_todos_builder.rb +++ b/app/models/recurring_todos/abstract_recurring_todos_builder.rb @@ -1,20 +1,18 @@ module RecurringTodos - class AbstractRecurringTodosBuilder - attr_reader :mapped_attributes, :pattern def initialize(user, attributes, pattern_class) @user = user @saved = false - @attributes = attributes - @selector = get_selector(selector_key) - @filterred_attributes = filter_attributes(@attributes) - @mapped_attributes = map_attributes(@filterred_attributes) + @attributes = attributes + @selector = get_selector(selector_key) + @filtered_attributes = filter_attributes(@attributes) + @mapped_attributes = map_attributes(@filtered_attributes) - @pattern = pattern_class.new(user) - @pattern.attributes = @mapped_attributes + @pattern = pattern_class.new(user) + @pattern.attributes = @mapped_attributes end # build does not add tags. For tags, the recurring todos needs to be saved @@ -60,36 +58,36 @@ module RecurringTodos def filter_attributes(attributes) # get pattern independend attributes - filterred_attributes = filter_generic_attributes(attributes) + filtered_attributes = filter_generic_attributes(attributes) # append pattern specific attributes - attributes_to_filter.each{|key| filterred_attributes[key]= attributes[key] if attributes.key?(key)} + attributes_to_filter.each{ |key| filtered_attributes[key]= attributes[key] if attributes.key?(key) } - filterred_attributes + filtered_attributes end def filter_generic_attributes(attributes) return Tracks::AttributeHandler.new(@user, { - recurring_period: attributes[:recurring_period], - description: attributes[:description], - notes: attributes[:notes], - tag_list: tag_list_or_empty_string(attributes), - start_from: attributes[:start_from], - end_date: attributes[:end_date], - ends_on: attributes[:ends_on], + recurring_period: attributes[:recurring_period], + description: attributes[:description], + notes: attributes[:notes], + tag_list: tag_list_or_empty_string(attributes), + start_from: attributes[:start_from], + end_date: attributes[:end_date], + ends_on: attributes[:ends_on], number_of_occurrences: attributes[:number_of_occurrences], - project: attributes[:project], - context: attributes[:context], - project_id: attributes[:project_id], - context_id: attributes[:context_id], - target: attributes[:recurring_target], - show_from_delta: attributes[:recurring_show_days_before], - show_always: attributes[:recurring_show_always] + project: attributes[:project], + context: attributes[:context], + project_id: attributes[:project_id], + context_id: attributes[:context_id], + target: attributes[:recurring_target], + show_from_delta: attributes[:recurring_show_days_before], + show_always: attributes[:recurring_show_always] }) end def map_attributes # should be overwritten by subclasses to map attributes to activerecord model attributes - @filterred_attributes + @filtered_attributes end # helper method to be used in mapped_attributes in subclasses @@ -129,7 +127,7 @@ module RecurringTodos end def save_tags - @recurring_todo.tag_with(@filterred_attributes[:tag_list]) if @filterred_attributes[:tag_list].present? + @recurring_todo.tag_with(@filtered_attributes[:tag_list]) if @filtered_attributes[:tag_list].present? @recurring_todo.reload end @@ -145,7 +143,5 @@ module RecurringTodos # avoid nil attributes[:tag_list].blank? ? "" : attributes[:tag_list].strip end - end - end diff --git a/app/models/recurring_todos/daily_recurrence_pattern.rb b/app/models/recurring_todos/daily_recurrence_pattern.rb index d6f0f3c2..69e2d73f 100644 --- a/app/models/recurring_todos/daily_recurrence_pattern.rb +++ b/app/models/recurring_todos/daily_recurrence_pattern.rb @@ -1,7 +1,5 @@ module RecurringTodos - class DailyRecurrencePattern < AbstractRecurrencePattern - def initialize(user) super user end @@ -44,9 +42,8 @@ module RecurringTodos else # if there was no previous todo, do not add n: the first todo starts on # today or on start_from - return previous == nil ? start : start+every_x_days.day-1.day + return previous == nil ? start : start + every_x_days.day - 1.day end end - end end diff --git a/app/models/recurring_todos/daily_recurring_todos_builder.rb b/app/models/recurring_todos/daily_recurring_todos_builder.rb index 15a18512..34549229 100644 --- a/app/models/recurring_todos/daily_recurring_todos_builder.rb +++ b/app/models/recurring_todos/daily_recurring_todos_builder.rb @@ -1,5 +1,4 @@ module RecurringTodos - class DailyRecurringTodosBuilder < AbstractRecurringTodosBuilder attr_reader :recurring_todo, :pattern @@ -19,7 +18,7 @@ module RecurringTodos def only_work_days?(daily_selector) { 'daily_every_x_day' => false, - 'daily_every_work_day' => true}[daily_selector] + 'daily_every_work_day' => true }[daily_selector] end def selector_key @@ -29,7 +28,5 @@ module RecurringTodos def valid_selector?(selector) %w{daily_every_x_day daily_every_work_day}.include?(selector) end - end - end diff --git a/app/models/recurring_todos/monthly_recurrence_pattern.rb b/app/models/recurring_todos/monthly_recurrence_pattern.rb index 6b49835d..6ae064dc 100644 --- a/app/models/recurring_todos/monthly_recurrence_pattern.rb +++ b/app/models/recurring_todos/monthly_recurrence_pattern.rb @@ -1,7 +1,5 @@ module RecurringTodos - class MonthlyRecurrencePattern < AbstractRecurrencePattern - def initialize(user) super user end diff --git a/app/models/recurring_todos/monthly_recurring_todos_builder.rb b/app/models/recurring_todos/monthly_recurring_todos_builder.rb index af12df0c..5a472757 100644 --- a/app/models/recurring_todos/monthly_recurring_todos_builder.rb +++ b/app/models/recurring_todos/monthly_recurring_todos_builder.rb @@ -1,5 +1,4 @@ module RecurringTodos - class MonthlyRecurringTodosBuilder < AbstractRecurringTodosBuilder attr_reader :recurring_todo @@ -26,7 +25,7 @@ module RecurringTodos end def get_recurrence_selector - @selector=='monthly_every_x_day' ? 0 : 1 + @selector == 'monthly_every_x_day' ? 0 : 1 end def get_every_other2 @@ -40,7 +39,5 @@ module RecurringTodos def valid_selector?(selector) %w{monthly_every_x_day monthly_every_xth_day}.include?(selector) end - end - end diff --git a/app/models/recurring_todos/recurring_todos_builder.rb b/app/models/recurring_todos/recurring_todos_builder.rb index 56bbcaf5..36412d62 100644 --- a/app/models/recurring_todos/recurring_todos_builder.rb +++ b/app/models/recurring_todos/recurring_todos_builder.rb @@ -1,7 +1,5 @@ module RecurringTodos - class RecurringTodosBuilder - attr_reader :builder, :project, :context, :tag_list, :user def initialize (user, attributes) @@ -17,7 +15,7 @@ module RecurringTodos def create_builder(selector) raise "Unknown recurrence selector in :recurring_period (#{selector})" unless valid_selector? selector - eval("RecurringTodos::#{selector.capitalize}RecurringTodosBuilder.new(@user, @attributes)") + eval("RecurringTodos::#{selector.capitalize}RecurringTodosBuilder.new(@user, @attributes)", binding, __FILE__, __LINE__) end def build @@ -72,7 +70,5 @@ module RecurringTodos def parse_context @context, @new_context_created = @attributes.parse_collection(:context, @user.contexts) end - end - -end \ No newline at end of file +end diff --git a/app/models/recurring_todos/weekly_recurrence_pattern.rb b/app/models/recurring_todos/weekly_recurrence_pattern.rb index db1a834a..60feef15 100644 --- a/app/models/recurring_todos/weekly_recurrence_pattern.rb +++ b/app/models/recurring_todos/weekly_recurrence_pattern.rb @@ -1,7 +1,5 @@ module RecurringTodos - class WeeklyRecurrencePattern < AbstractRecurrencePattern - def initialize(user) super user end @@ -31,7 +29,7 @@ module RecurringTodos def validate super validate_not_blank(every_x_week, "Every other nth week may not be empty for weekly recurrence setting") - something_set = %w{sunday monday tuesday wednesday thursday friday saturday}.inject(false) { |set, day| set || self.send("on_#{day}") } + something_set = %w{ sunday monday tuesday wednesday thursday friday saturday }.inject(false) { |set, day| set || self.send("on_#{day}") } errors[:base] << "You must specify at least one day on which the todo recurs" unless something_set end @@ -61,7 +59,7 @@ module RecurringTodos if start.wday() == 0 # we went to a new week, go to the nth next week and find first match # that week. Note that we already went into the next week, so -1 - start += (every_x_week-1).week + start += (every_x_week - 1).week end unless self.start_from.nil? # check if the start_from date is later than previous. If so, use @@ -75,12 +73,9 @@ module RecurringTodos def find_first_day_in_this_week(start) # check if there are any days left this week for the next todo start.wday().upto 6 do |i| - return start + (i-start.wday()).days if on_xday(i) + return start + (i - start.wday()).days if on_xday(i) end -1 end - - end - end diff --git a/app/models/recurring_todos/weekly_recurring_todos_builder.rb b/app/models/recurring_todos/weekly_recurring_todos_builder.rb index c23dc4b8..790185e5 100644 --- a/app/models/recurring_todos/weekly_recurring_todos_builder.rb +++ b/app/models/recurring_todos/weekly_recurring_todos_builder.rb @@ -1,5 +1,4 @@ module RecurringTodos - class WeeklyRecurringTodosBuilder < AbstractRecurringTodosBuilder attr_reader :recurring_todo @@ -8,7 +7,7 @@ module RecurringTodos end def attributes_to_filter - %w{weekly_selector weekly_every_x_week} + %w{monday tuesday wednesday thursday friday saturday sunday}.map{|day| "weekly_return_#{day}" } + %w{ weekly_selector weekly_every_x_week } + %w{ monday tuesday wednesday thursday friday saturday sunday }.map{ |day| "weekly_return_#{day}" } end def map_attributes(mapping) @@ -26,7 +25,7 @@ module RecurringTodos mapping.set_if_nil(key, ' ') # avoid nil mapping.set_if_nil(source_key, ' ') # avoid nil - mapping.set(key, mapping.get(key)[0, index] + mapping.get(source_key) + mapping.get(key)[index+1, mapping.get(key).length]) + mapping.set(key, mapping.get(key)[0, index] + mapping.get(source_key) + mapping.get(key)[index + 1, mapping.get(key).length]) mapping.except(source_key) end @@ -37,7 +36,5 @@ module RecurringTodos def valid_selector?(key) true end - end - end diff --git a/app/models/recurring_todos/yearly_recurrence_pattern.rb b/app/models/recurring_todos/yearly_recurrence_pattern.rb index bafe66cc..06cdec59 100644 --- a/app/models/recurring_todos/yearly_recurrence_pattern.rb +++ b/app/models/recurring_todos/yearly_recurrence_pattern.rb @@ -1,7 +1,5 @@ module RecurringTodos - class YearlyRecurrencePattern < AbstractRecurrencePattern - def initialize(user) super user end @@ -104,6 +102,5 @@ module RecurringTodos the_next end - end end diff --git a/app/models/recurring_todos/yearly_recurring_todos_builder.rb b/app/models/recurring_todos/yearly_recurring_todos_builder.rb index 94c3630c..0e8cfa5e 100644 --- a/app/models/recurring_todos/yearly_recurring_todos_builder.rb +++ b/app/models/recurring_todos/yearly_recurring_todos_builder.rb @@ -1,5 +1,4 @@ module RecurringTodos - class YearlyRecurringTodosBuilder < AbstractRecurringTodosBuilder attr_reader :recurring_todo @@ -39,7 +38,5 @@ module RecurringTodos def get_every_other2 { 0 => :yearly_month_of_year, 1 => :yearly_month_of_year2 }[get_recurrence_selector] end - end - end diff --git a/app/models/search/search_results.rb b/app/models/search/search_results.rb index 73463656..4db5d59d 100644 --- a/app/models/search/search_results.rb +++ b/app/models/search/search_results.rb @@ -1,5 +1,4 @@ module Search - class SearchResults attr_reader :results @@ -27,28 +26,26 @@ module Search def incomplete_todos(terms) @user.todos. - where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND todos.completed_at IS NULL", terms, terms). - includes(Todo::DEFAULT_INCLUDES). - reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) + where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND todos.completed_at IS NULL", terms, terms) + .includes(Todo::DEFAULT_INCLUDES) + .reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) end def complete_todos(terms) @user.todos. - where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND NOT (todos.completed_at IS NULL)", terms, terms). - includes(Todo::DEFAULT_INCLUDES). - reorder("todos.completed_at DESC") + where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND NOT (todos.completed_at IS NULL)", terms, terms) + .includes(Todo::DEFAULT_INCLUDES) + .reorder("todos.completed_at DESC") end def todo_tags_by_name(terms) Tagging.find_by_sql([ - "SELECT DISTINCT tags.name as name "+ - "FROM tags "+ - "LEFT JOIN taggings ON tags.id = taggings.tag_id "+ - "LEFT JOIN todos ON taggings.taggable_id = todos.id "+ - "WHERE todos.user_id=? "+ - "AND tags.name " + Common.like_operator + " ? ", @user.id, terms]) + "SELECT DISTINCT tags.name as name " + + "FROM tags " + + "LEFT JOIN taggings ON tags.id = taggings.tag_id " + + "LEFT JOIN todos ON taggings.taggable_id = todos.id " + + "WHERE todos.user_id=? " + + "AND tags.name " + Common.like_operator + " ? ", @user.id, terms]) end - end - end diff --git a/app/models/stats/actions.rb b/app/models/stats/actions.rb index 2d862d46..3f29eccc 100644 --- a/app/models/stats/actions.rb +++ b/app/models/stats/actions.rb @@ -1,9 +1,9 @@ module Stats class Actions - - SECONDS_PER_DAY = 86400; + SECONDS_PER_DAY = 86_400 attr_reader :user + def initialize(user) @user = user @@ -58,17 +58,17 @@ module Stats @interpolated_actions_created_this_month = interpolate_avg_for_current_month(@actions_created_last12months_array) @interpolated_actions_done_this_month = interpolate_avg_for_current_month(@actions_done_last12months_array) - @created_count_array = Array.new(13, actions_last12months.created_after(@cut_off_year).count(:all)/12.0) - @done_count_array = Array.new(13, actions_last12months.completed_after(@cut_off_year).count(:all)/12.0) + @created_count_array = Array.new(13, actions_last12months.created_after(@cut_off_year).count(:all) / 12.0) + @done_count_array = Array.new(13, actions_last12months.completed_after(@cut_off_year).count(:all) / 12.0) return { datasets: [ - {label: I18n.t('stats.labels.avg_created'), data: @created_count_array, type: "line"}, - {label: I18n.t('stats.labels.avg_completed'), data: @done_count_array, type: "line"}, - {label: I18n.t('stats.labels.month_avg_completed', :months => 3), data: @actions_done_avg_last12months_array, type: "line"}, - {label: I18n.t('stats.labels.month_avg_created', :months => 3), data: @actions_created_avg_last12months_array, type: "line"}, - {label: I18n.t('stats.labels.created'), data: @actions_created_last12months_array}, - {label: I18n.t('stats.labels.completed'), data: @actions_done_last12months_array}, + { label: I18n.t('stats.labels.avg_created'), data: @created_count_array, type: "line" }, + { label: I18n.t('stats.labels.avg_completed'), data: @done_count_array, type: "line" }, + { label: I18n.t('stats.labels.month_avg_completed', :months => 3), data: @actions_done_avg_last12months_array, type: "line" }, + { label: I18n.t('stats.labels.month_avg_created', :months => 3), data: @actions_created_avg_last12months_array, type: "line" }, + { label: I18n.t('stats.labels.created'), data: @actions_created_last12months_array }, + { label: I18n.t('stats.labels.completed'), data: @actions_done_last12months_array }, ], labels: array_of_month_labels(@done_count_array.size), } @@ -86,17 +86,17 @@ module Stats # find max for graph in both hashes @max = [@actions_done_last30days_array.max, @actions_created_last30days_array.max].max - created_count_array = Array.new(30){ |i| @actions_created_last30days.size/30.0 } - done_count_array = Array.new(30){ |i| @actions_done_last30days.size/30.0 } + created_count_array = Array.new(30) { |i| @actions_created_last30days.size / 30.0 } + done_count_array = Array.new(30) { |i| @actions_done_last30days.size / 30.0 } # TODO: make the strftime i18n proof - time_labels = Array.new(30){ |i| I18n.l(Time.zone.now-i.days, :format => :stats) } + time_labels = Array.new(30) { |i| I18n.l(Time.zone.now-i.days, :format => :stats) } return { datasets: [ - {label: I18n.t('stats.labels.avg_created'), data: created_count_array, type: "line"}, - {label: I18n.t('stats.labels.avg_completed'), data: done_count_array, type: "line"}, - {label: I18n.t('stats.labels.created'), data: @actions_created_last30days_array}, - {label: I18n.t('stats.labels.completed'), data: @actions_done_last30days_array}, + { label: I18n.t('stats.labels.avg_created'), data: created_count_array, type: "line" }, + { label: I18n.t('stats.labels.avg_completed'), data: done_count_array, type: "line" }, + { label: I18n.t('stats.labels.created'), data: @actions_created_last30days_array }, + { label: I18n.t('stats.labels.completed'), data: @actions_done_last30days_array }, ], labels: time_labels, } @@ -119,14 +119,14 @@ module Stats # get percentage done cumulative @cum_percent_done = convert_to_cumulative_array(@actions_completion_time_array, @actions_completion_time.count(:all)) - time_labels = Array.new(@count){ |i| "#{i}-#{i+1}" } + time_labels = Array.new(@count) { |i| "#{i}-#{i+1}" } time_labels[0] = I18n.t('stats.within_one') time_labels[@count] = "> #{@count}" return { datasets: [ - {label: I18n.t('stats.legend.percentage'), data: @cum_percent_done, type: "line"}, - {label: I18n.t('stats.legend.actions'), data: @actions_completion_time_array}, + { label: I18n.t('stats.legend.percentage'), data: @cum_percent_done, type: "line" }, + { label: I18n.t('stats.legend.actions'), data: @actions_completion_time_array }, ], labels: time_labels, } @@ -149,14 +149,14 @@ module Stats # get percentage done cumulative @cum_percent_done = convert_to_cumulative_array(@actions_running_time_array, @actions_running_time.count ) - time_labels = Array.new(@count){ |i| "#{i}-#{i+1}" } + time_labels = Array.new(@count) { |i| "#{i}-#{i+1}" } time_labels[0] = "< 1" time_labels[@count] = "> #{@count}" return { datasets: [ - {label: I18n.t('stats.running_time_all_legend.percentage'), data: @cum_percent_done, type: "line"}, - {label: I18n.t('stats.running_time_all_legend.actions'), data: @actions_running_time_array}, + { label: I18n.t('stats.running_time_all_legend.percentage'), data: @cum_percent_done, type: "line" }, + { label: I18n.t('stats.running_time_all_legend.actions'), data: @actions_running_time_array }, ], labels: time_labels, } @@ -171,12 +171,12 @@ module Stats # - actions not deferred (show_from must be null) # - actions not pending/blocked - @actions_running_time = @user.todos.not_completed.not_hidden.not_deferred_or_blocked. - select("todos.created_at"). - reorder("todos.created_at DESC") + @actions_running_time = @user.todos.not_completed.not_hidden.not_deferred_or_blocked + .select("todos.created_at") + .reorder("todos.created_at DESC") @max_weeks = difference_in_weeks(@today, @actions_running_time.last.created_at) - @actions_running_per_week_array = convert_to_weeks_from_today_array(@actions_running_time, @max_weeks+1, :created_at) + @actions_running_per_week_array = convert_to_weeks_from_today_array(@actions_running_time, @max_weeks + 1, :created_at) # cut off chart at 52 weeks = one year @count = [52, @max_weeks].min @@ -188,23 +188,23 @@ module Stats # get percentage done cumulative @cum_percent_done = convert_to_cumulative_array(@actions_running_time_array, @actions_running_time.count ) - time_labels = Array.new(@count){ |i| "#{i}-#{i+1}" } + time_labels = Array.new(@count) { |i| "#{i}-#{i+1}" } time_labels[0] = "< 1" time_labels[@count] = "> #{@count}" return { datasets: [ - {label: I18n.t('stats.running_time_legend.percentage'), data: @cum_percent_done, type: "line"}, - {label: I18n.t('stats.running_time_legend.actions'), data: @actions_running_time_array}, + { label: I18n.t('stats.running_time_legend.percentage'), data: @cum_percent_done, type: "line" }, + { label: I18n.t('stats.running_time_legend.actions'), data: @actions_running_time_array }, ], labels: time_labels, } end def open_per_week_data - @actions_started = @user.todos.created_after(@today-53.weeks). - select("todos.created_at, todos.completed_at"). - reorder("todos.created_at DESC") + @actions_started = @user.todos.created_after(@today - 53.weeks) + .select("todos.created_at, todos.completed_at") + .reorder("todos.created_at DESC") @max_weeks = difference_in_weeks(@today, @actions_started.last.created_at) @@ -214,12 +214,12 @@ module Stats @actions_open_per_week_array = convert_to_weeks_running_from_today_array(@actions_started, @max_weeks+1) @actions_open_per_week_array = cut_off_array(@actions_open_per_week_array, @count) - time_labels = Array.new(@count+1){ |i| "#{i}-#{i+1}" } - time_labels[0] = "< 1" + time_labels = Array.new(@count+1) { |i| "#{i}-#{i+1}" } + time_labels[0] = "< 1" return { datasets: [ - {label: I18n.t('stats.open_per_week_legend.actions'), data: @actions_open_per_week_array}, + { label: I18n.t('stats.open_per_week_legend.actions'), data: @actions_open_per_week_array }, ], labels: time_labels, } @@ -230,18 +230,18 @@ module Stats @actions_completion_day = @user.todos.completed.select("completed_at") # convert to array and fill in non-existing days - @actions_creation_day_array = Array.new(7) { |i| 0} - @actions_creation_day.each { |t| @actions_creation_day_array[ t.created_at.wday ] += 1 } + @actions_creation_day_array = Array.new(7) { |i| 0 } + @actions_creation_day.each { |t| @actions_creation_day_array[t.created_at.wday] += 1 } @max = @actions_creation_day_array.max # convert to array and fill in non-existing days - @actions_completion_day_array = Array.new(7) { |i| 0} - @actions_completion_day.each { |t| @actions_completion_day_array[ t.completed_at.wday ] += 1 } + @actions_completion_day_array = Array.new(7) { |i| 0 } + @actions_completion_day.each { |t| @actions_completion_day_array[t.completed_at.wday] += 1 } return { datasets: [ - {label: I18n.t('stats.labels.created'), data: @actions_creation_day_array}, - {label: I18n.t('stats.labels.completed'), data: @actions_completion_day_array}, + { label: I18n.t('stats.labels.created'), data: @actions_creation_day_array }, + { label: I18n.t('stats.labels.completed'), data: @actions_completion_day_array }, ], labels: I18n.t('date.day_names'), } @@ -253,17 +253,17 @@ module Stats # convert to hash to be able to fill in non-existing days @max=0 - @actions_creation_day_array = Array.new(7) { |i| 0} - @actions_creation_day.each { |r| @actions_creation_day_array[ r.created_at.wday ] += 1 } + @actions_creation_day_array = Array.new(7) { |i| 0 } + @actions_creation_day.each { |r| @actions_creation_day_array[r.created_at.wday] += 1 } # convert to hash to be able to fill in non-existing days - @actions_completion_day_array = Array.new(7) { |i| 0} + @actions_completion_day_array = Array.new(7) { |i| 0 } @actions_completion_day.each { |r| @actions_completion_day_array[r.completed_at.wday] += 1 } return { datasets: [ - {label: I18n.t('stats.labels.created'), data: @actions_creation_day_array}, - {label: I18n.t('stats.labels.completed'), data: @actions_completion_day_array}, + { label: I18n.t('stats.labels.created'), data: @actions_creation_day_array }, + { label: I18n.t('stats.labels.completed'), data: @actions_completion_day_array }, ], labels: I18n.t('date.day_names'), } @@ -274,17 +274,17 @@ module Stats @actions_completion_hour = @user.todos.completed.select("completed_at") # convert to hash to be able to fill in non-existing days - @actions_creation_hour_array = Array.new(24) { |i| 0} + @actions_creation_hour_array = Array.new(24) { |i| 0 } @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 } # convert to hash to be able to fill in non-existing days - @actions_completion_hour_array = Array.new(24) { |i| 0} + @actions_completion_hour_array = Array.new(24) { |i| 0 } @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 } return { datasets: [ - {label: I18n.t('stats.labels.created'), data: @actions_creation_hour_array}, - {label: I18n.t('stats.labels.completed'), data: @actions_completion_hour_array}, + { label: I18n.t('stats.labels.created'), data: @actions_creation_hour_array }, + { label: I18n.t('stats.labels.completed'), data: @actions_completion_hour_array }, ], labels: @actions_creation_hour_array.each_with_index.map { |total, hour| [hour] }, } @@ -295,17 +295,17 @@ module Stats @actions_completion_hour = @user.todos.completed_after(@cut_off_month).select("completed_at") # convert to hash to be able to fill in non-existing days - @actions_creation_hour_array = Array.new(24) { |i| 0} + @actions_creation_hour_array = Array.new(24) { |i| 0 } @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 } # convert to hash to be able to fill in non-existing days - @actions_completion_hour_array = Array.new(24) { |i| 0} + @actions_completion_hour_array = Array.new(24) { |i| 0 } @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 } return { datasets: [ - {label: I18n.t('stats.labels.created'), data: @actions_creation_hour_array}, - {label: I18n.t('stats.labels.completed'), data: @actions_completion_hour_array}, + { label: I18n.t('stats.labels.created'), data: @actions_creation_hour_array }, + { label: I18n.t('stats.labels.completed'), data: @actions_completion_hour_array }, ], labels: @actions_creation_hour_array.each_with_index.map { |total, hour| [hour] }, } @@ -334,7 +334,7 @@ module Stats end def interpolate_avg_for_current_month(set) - (set[0]*(1/percent_of_month) + set[1] + set[2]) / 3.0 + (set[0] * (1 / percent_of_month) + set[1] + set[2]) / 3.0 end def percent_of_month @@ -350,15 +350,15 @@ module Stats end def put_events_into_month_buckets(records, array_size, date_method_on_todo) - convert_to_array(records.select { |x| x.send(date_method_on_todo) }, array_size) { |r| [difference_in_months(@today, r.send(date_method_on_todo))]} + convert_to_array(records.select { |x| x.send(date_method_on_todo) }, array_size) { |r| [difference_in_months(@today, r.send(date_method_on_todo))] } end def convert_to_days_from_today_array(records, array_size, date_method_on_todo) - return convert_to_array(records, array_size){ |r| [difference_in_days(@today, r.send(date_method_on_todo))]} + return convert_to_array(records, array_size) { |r| [difference_in_days(@today, r.send(date_method_on_todo))] } end def convert_to_weeks_from_today_array(records, array_size, date_method_on_todo) - return convert_to_array(records, array_size) { |r| [difference_in_weeks(@today, r.send(date_method_on_todo))]} + return convert_to_array(records, array_size) { |r| [difference_in_weeks(@today, r.send(date_method_on_todo))] } end def convert_to_weeks_running_array(records, array_size) @@ -373,37 +373,37 @@ module Stats a = [] start_week = difference_in_weeks(@today, record.created_at) end_week = record.completed_at ? difference_in_weeks(@today, record.completed_at) : 0 - end_week.upto(start_week) { |i| a << i }; + end_week.upto(start_week) { |i| a << i } return a end def cut_off_array_with_sum(array, cut_off) # +1 to hold sum of rest - a = Array.new(cut_off+1){|i| array[i]||0} + a = Array.new(cut_off + 1) { |i| array[i] || 0 } # add rest of array to last elem a[cut_off] += array.inject(:+) - a.inject(:+) return a end def cut_off_array(array, cut_off) - return Array.new(cut_off){|i| array[i]||0} + return Array.new(cut_off) { |i| array[i] || 0 } end def convert_to_cumulative_array(array, max) # calculate fractions - a = Array.new(array.size){|i| array[i]*100.0/max} + a = Array.new(array.size) {|i| array[i] * 100.0 / max} # make cumulative - 1.upto(array.size-1){ |i| a[i] += a[i-1] } + 1.upto(array.size-1) { |i| a[i] += a[i - 1] } return a end def difference_in_months(date1, date2) - return (date1.utc.year - date2.utc.year)*12 + (date1.utc.month - date2.utc.month) + return (date1.utc.year - date2.utc.year) * 12 + (date1.utc.month - date2.utc.month) end # assumes date1 > date2 def difference_in_days(date1, date2) - return ((date1.utc.at_midnight-date2.utc.at_midnight)/SECONDS_PER_DAY).to_i + return ((date1.utc.at_midnight - date2.utc.at_midnight) / SECONDS_PER_DAY).to_i end # assumes date1 > date2 @@ -412,23 +412,23 @@ module Stats end def three_month_avg(set, i) - (set.fetch(i){ 0 } + set.fetch(i+1){ 0 } + set.fetch(i+2){ 0 }) / 3.0 + (set.fetch(i) { 0 } + set.fetch(i+1) { 0 } + set.fetch(i + 2) { 0 }) / 3.0 end - def set_three_month_avg(set,upper_bound) - (0..upper_bound-1).map { |i| three_month_avg(set, i) } + def set_three_month_avg(set, upper_bound) + (0..upper_bound - 1).map { |i| three_month_avg(set, i) } end def compute_running_avg_array(set, upper_bound) result = set_three_month_avg(set, upper_bound) - result[upper_bound-1] = result[upper_bound-1] * 3 if upper_bound == set.length - result[upper_bound-2] = result[upper_bound-2] * 3 / 2 if upper_bound > 1 and upper_bound == set.length + result[upper_bound - 1] = result[upper_bound-1] * 3 if upper_bound == set.length + result[upper_bound - 2] = result[upper_bound-2] * 3 / 2 if upper_bound > 1 and upper_bound == set.length result[0] = "null" result end # unsolved, not triggered, edge case for set.length == upper_bound + 1 def month_label(i) - I18n.t('date.month_names')[ (Time.zone.now.mon - i -1 ) % 12 + 1 ] + I18n.t('date.month_names')[(Time.zone.now.mon - i -1 ) % 12 + 1] end def array_of_month_labels(count) diff --git a/app/models/stats/chart.rb b/app/models/stats/chart.rb index 66fc59a8..ad8eb6c4 100644 --- a/app/models/stats/chart.rb +++ b/app/models/stats/chart.rb @@ -1,8 +1,7 @@ module Stats - class Chart - attr_reader :action, :height, :width + def initialize(action, dimensions = {}) @action = action @height = dimensions.fetch(:height) { 250 } @@ -12,7 +11,5 @@ module Stats def dimensions "#{width}x#{height}" end - end - end diff --git a/app/models/stats/contexts.rb b/app/models/stats/contexts.rb index 488663ca..b07ac460 100644 --- a/app/models/stats/contexts.rb +++ b/app/models/stats/contexts.rb @@ -1,7 +1,7 @@ module Stats class Contexts - attr_reader :user + def initialize(user) @user = user end diff --git a/app/models/stats/projects.rb b/app/models/stats/projects.rb index 9e2a14d6..429e68ed 100644 --- a/app/models/stats/projects.rb +++ b/app/models/stats/projects.rb @@ -1,7 +1,7 @@ module Stats class Projects - attr_reader :user + def initialize(user) @user = user end @@ -24,6 +24,5 @@ module Stats projects = user.projects.order('created_at ASC') projects.sort_by{ |p| p.running_time }.reverse.take(10) end - end end diff --git a/app/models/stats/tag_cloud.rb b/app/models/stats/tag_cloud.rb index 67865f27..5fe74d11 100644 --- a/app/models/stats/tag_cloud.rb +++ b/app/models/stats/tag_cloud.rb @@ -2,8 +2,8 @@ # http://www.juixe.com/techknow/index.php/2006/07/15/acts-as-taggable-tag-cloud/ module Stats class TagCloud - attr_reader :levels, :tags + def initialize(tags) @levels = 10 @tags = tags.sort_by { |tag| tag.name.downcase } @@ -32,7 +32,7 @@ module Stats end def counts - @counts ||= tags.map {|t| t.count} + @counts ||= tags.map { |t| t.count } end end end diff --git a/app/models/stats/tag_cloud_query.rb b/app/models/stats/tag_cloud_query.rb index e754cc6c..a5dcbbf8 100644 --- a/app/models/stats/tag_cloud_query.rb +++ b/app/models/stats/tag_cloud_query.rb @@ -1,7 +1,7 @@ module Stats class TagCloudQuery - attr_reader :user, :cutoff + def initialize(user, cutoff = nil) @user = user @cutoff = cutoff @@ -19,20 +19,19 @@ module Stats def sql # TODO: parameterize limit - query = "SELECT tags.id, tags.name AS name, count(*) AS count" + query = "SELECT tags.id, tags.name AS name, COUNT(*) AS count" query << " FROM taggings, tags, todos" query << " WHERE tags.id = tag_id" - query << " AND todos.user_id=? " - query << " AND taggings.taggable_type='Todo' " - query << " AND taggings.taggable_id=todos.id " + query << " AND todos.user_id = ? " + query << " AND taggings.taggable_type = 'Todo' " + query << " AND taggings.taggable_id = todos.id " if cutoff query << " AND (todos.created_at > ? OR " query << " todos.completed_at > ?) " end query << " GROUP BY tags.id, tags.name" - query << " ORDER BY count DESC, name" + query << " ORDER BY count DESC, name " query << " LIMIT 100" end - end end diff --git a/app/models/stats/time_to_complete.rb b/app/models/stats/time_to_complete.rb index 3a146c13..13226419 100644 --- a/app/models/stats/time_to_complete.rb +++ b/app/models/stats/time_to_complete.rb @@ -1,9 +1,9 @@ module Stats class TimeToComplete - - SECONDS_PER_DAY = 86400; + SECONDS_PER_DAY = 86_400 attr_reader :actions + def initialize(actions) @actions = actions end @@ -52,12 +52,11 @@ module Stats end def sum - @sum ||= durations.inject(0) {|sum, d| sum + d} + @sum ||= durations.inject(0) { |sum, d| sum + d } end def arbitrary_day @arbitrary_day ||= Time.utc(2000, 1, 1, 0, 0) end - end end diff --git a/app/models/stats/top_contexts_query.rb b/app/models/stats/top_contexts_query.rb index d47abfb1..453e2d06 100644 --- a/app/models/stats/top_contexts_query.rb +++ b/app/models/stats/top_contexts_query.rb @@ -3,8 +3,8 @@ # and visible contexts will be included. module Stats class TopContextsQuery - attr_reader :user, :running, :limit + def initialize(user, options = {}) @user = user @running = options.fetch(:running) { false } diff --git a/app/models/stats/top_projects_query.rb b/app/models/stats/top_projects_query.rb index 1ed70f44..e21d8228 100644 --- a/app/models/stats/top_projects_query.rb +++ b/app/models/stats/top_projects_query.rb @@ -3,8 +3,8 @@ # or completed since that cutoff will be included. module Stats class TopProjectsQuery - attr_reader :user, :cutoff + def initialize(user, cutoff = nil) @user = user @cutoff = cutoff @@ -34,6 +34,5 @@ module Stats query << "ORDER BY count DESC " query << "LIMIT 10" end - end end diff --git a/app/models/stats/totals.rb b/app/models/stats/totals.rb index 49104678..9309bf80 100644 --- a/app/models/stats/totals.rb +++ b/app/models/stats/totals.rb @@ -1,7 +1,7 @@ module Stats class Totals - attr_reader :user + def initialize(user) @user = user end @@ -83,6 +83,5 @@ module Stats def tag_ids @tag_ids ||= Stats::UserTagsQuery.new(user).result.map(&:id) end - end end diff --git a/app/models/stats/user_stats.rb b/app/models/stats/user_stats.rb index 6aaf52af..757565bb 100644 --- a/app/models/stats/user_stats.rb +++ b/app/models/stats/user_stats.rb @@ -1,7 +1,7 @@ module Stats class UserStats - attr_reader :user + def initialize(user) @user = user end @@ -38,6 +38,5 @@ module Stats end @tag_cloud_90days end - end end diff --git a/app/models/stats/user_tags_query.rb b/app/models/stats/user_tags_query.rb index 034e5adb..057d4eba 100644 --- a/app/models/stats/user_tags_query.rb +++ b/app/models/stats/user_tags_query.rb @@ -1,7 +1,7 @@ module Stats class UserTagsQuery - attr_reader :user + def initialize(user) @user = user end @@ -21,6 +21,5 @@ module Stats AND todos.user_id = ? SQL end - end end diff --git a/app/models/tag.rb b/app/models/tag.rb index 2c710dad..fc3b876e 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -1,5 +1,4 @@ class Tag < ApplicationRecord - has_many :taggings has_many :taggable, :through => :taggings @@ -29,5 +28,4 @@ class Tag < ApplicationRecord def to_s name end - end diff --git a/app/models/tagging.rb b/app/models/tagging.rb index a89d1e10..42513283 100644 --- a/app/models/tagging.rb +++ b/app/models/tagging.rb @@ -1,8 +1,5 @@ - # The Tagging join model. - class Tagging < ApplicationRecord - belongs_to :tag belongs_to :taggable, :polymorphic => true, :touch => true @@ -13,5 +10,4 @@ class Tagging < ApplicationRecord def delete_orphaned_tag tag.destroy if tag and tag.taggings.count == 0 end - end diff --git a/app/models/todo.rb b/app/models/todo.rb index f40da3ca..3c51320f 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -1,7 +1,6 @@ class Todo < ApplicationRecord - MAX_DESCRIPTION_LENGTH = 300 - MAX_NOTES_LENGTH = 60000 + MAX_NOTES_LENGTH = 60_000 after_save :save_predecessors @@ -19,9 +18,9 @@ class Todo < ApplicationRecord has_many :successor_dependencies, :foreign_key => 'successor_id', :class_name => 'Dependency', :dependent => :destroy has_many :predecessors, :through => :successor_dependencies has_many :successors, :through => :predecessor_dependencies - has_many :uncompleted_predecessors, -> {where('NOT (todos.state = ?)', 'completed')}, :through => :successor_dependencies, + has_many :uncompleted_predecessors, -> { where('NOT (todos.state = ?)', 'completed') }, :through => :successor_dependencies, :source => :predecessor - has_many :pending_successors, -> {where('todos.state = ?', 'pending')}, :through => :predecessor_dependencies, + has_many :pending_successors, -> { where('todos.state = ?', 'pending') }, :through => :predecessor_dependencies, :source => :successor has_many :attachments, dependent: :destroy @@ -32,14 +31,14 @@ class Todo < ApplicationRecord scope :project_hidden, -> { joins('LEFT OUTER JOIN projects p ON p.id = todos.project_id').where('p.state = ?', 'hidden') } scope :completed, -> { where 'todos.state = ?', 'completed' } scope :deferred, -> { where 'todos.state = ?', 'deferred' } - scope :blocked, -> {where 'todos.state = ?', 'pending' } - scope :pending, -> {where 'todos.state = ?', 'pending' } + scope :blocked, -> { where 'todos.state = ?', 'pending' } + scope :pending, -> { where 'todos.state = ?', 'pending' } scope :deferred_or_blocked, -> { where '(todos.state = ?) OR (todos.state = ?)', 'deferred', 'pending' } scope :hidden, -> { - joins('INNER JOIN contexts c_hidden ON c_hidden.id = todos.context_id'). - joins('LEFT OUTER JOIN projects p_hidden ON p_hidden.id = todos.project_id'). - where('(c_hidden.state = ? OR p_hidden.state = ?)', 'hidden', 'hidden'). - where('NOT todos.state = ?', 'completed') } + joins('INNER JOIN contexts c_hidden ON c_hidden.id = todos.context_id') + .joins('LEFT OUTER JOIN projects p_hidden ON p_hidden.id = todos.project_id') + .where('(c_hidden.state = ? OR p_hidden.state = ?)', 'hidden', 'hidden') + .where('NOT todos.state = ?', 'completed') } scope :not_hidden, -> { not_context_hidden.not_project_hidden } scope :not_deferred_or_blocked, -> { where '(NOT todos.state=?) AND (NOT todos.state = ?)', 'deferred', 'pending' } scope :not_project_hidden, -> { joins('LEFT OUTER JOIN projects p ON p.id = todos.project_id').where('p.id IS NULL OR NOT(p.state = ?)', 'hidden') } @@ -50,12 +49,12 @@ class Todo < ApplicationRecord scope :are_due, -> { where 'NOT (todos.due IS NULL)' } scope :due_today, -> { where("todos.due <= ?", Time.zone.now) } scope :with_tag, lambda { |tag_id| joins("INNER JOIN taggings ON todos.id = taggings.taggable_id").where("taggings.tag_id = ? AND taggings.taggable_type='Todo'", tag_id) } - scope :with_tags, lambda { |tag_ids| where("EXISTS(SELECT * from taggings t WHERE t.tag_id IN (?) AND t.taggable_id=todos.id AND t.taggable_type='Todo')", tag_ids) } + scope :with_tags, lambda { |tag_ids| where("EXISTS(SELECT * FROM taggings t WHERE t.tag_id IN (?) AND t.taggable_id=todos.id AND t.taggable_type='Todo')", tag_ids) } scope :completed_after, lambda { |date| where("todos.completed_at > ?", date) } scope :completed_before, lambda { |date| where("todos.completed_at < ?", date) } scope :created_after, lambda { |date| where("todos.created_at > ?", date) } scope :created_before, lambda { |date| where("todos.created_at < ?", date) } - scope :created_or_completed_after, lambda { |date| where("todos.created_at > ? or todos.completed_at > ?", date, date) } + scope :created_or_completed_after, lambda { |date| where("todos.created_at > ? OR todos.completed_at > ?", date, date) } def self.due_after(date) where('todos.due > ?', date) @@ -66,16 +65,15 @@ class Todo < ApplicationRecord end STARRED_TAG_NAME = "starred" - DEFAULT_INCLUDES = [ :project, :context, :tags, :taggings, :pending_successors, :uncompleted_predecessors, :recurring_todo ] + DEFAULT_INCLUDES = [:project, :context, :tags, :taggings, :pending_successors, :uncompleted_predecessors, :recurring_todo] # state machine include AASM - aasm_initial_state = Proc.new { (self.show_from && self.user && (self.show_from > self.user.date)) ? :deferred : :active} + aasm_initial_state = Proc.new { (self.show_from && self.user && (self.show_from > self.user.date)) ? :deferred : :active } aasm :column => :state do - state :active - state :completed, :before_enter => Proc.new { self.completed_at = Time.zone.now }, :before_exit => Proc.new { self.completed_at = nil} + state :completed, :before_enter => Proc.new { self.completed_at = Time.zone.now }, :before_exit => Proc.new { self.completed_at = nil } state :deferred, :before_exit => Proc.new { self[:show_from] = nil } state :pending @@ -124,7 +122,7 @@ class Todo < ApplicationRecord end def no_uncompleted_predecessors_or_deferral? - no_deferral = show_from.blank? or Time.zone.now > show_from + no_deferral = show_from.blank? || Time.zone.now > show_from return (no_deferral && no_uncompleted_predecessors?) end @@ -141,7 +139,7 @@ class Todo < ApplicationRecord end def not_part_of_hidden_container? - !( (self.project && self.project.hidden?) || self.context.hidden? ) + !((self.project && self.project.hidden?) || self.context.hidden?) end # Returns a string with description @@ -266,9 +264,9 @@ class Todo < ApplicationRecord def add_predecessor_list(predecessor_list) return unless predecessor_list.kind_of? String - @predecessor_array=predecessor_list.split(",").inject([]) do |list, todo_id| - predecessor = self.user.todos.find( todo_id.to_i ) if todo_id.present? - list << predecessor unless predecessor.nil? + @predecessor_array = predecessor_list.split(",").inject([]) do |list, todo_id| + predecessor = self.user.todos.find(todo_id.to_i) if todo_id.present? + list << predecessor unless predecessor.nil? list end @@ -284,15 +282,15 @@ class Todo < ApplicationRecord # activate todos that should be activated if the current todo is completed def activate_pending_todos - pending_todos = successors.select { |t| t.uncompleted_predecessors.empty? and !t.completed? } - pending_todos.each {|t| t.activate! } + pending_todos = successors.select { |t| t.uncompleted_predecessors.empty? && !t.completed? } + pending_todos.each { |t| t.activate! } return pending_todos end # Return todos that should be blocked if the current todo is undone def block_successors - active_successors = successors.select {|t| t.active? or t.deferred?} - active_successors.each {|t| t.block!} + active_successors = successors.select { |t| t.active? || t.deferred? } + active_successors.each { |t| t.block! } return active_successors end @@ -319,7 +317,7 @@ class Todo < ApplicationRecord else c = Context.where(:name => value[:name]).first c = Context.create(value) if c.nil? - self.original_context=(c) + self.original_context = (c) end end @@ -331,13 +329,13 @@ class Todo < ApplicationRecord alias_method :original_project=, :project= def project=(value) if value.is_a? Project - self.original_project=(value) + self.original_project = (value) elsif !(value.nil? || value.is_a?(NullProject)) p = Project.where(:name => value[:name]).first p = Project.create(value) if p.nil? - self.original_project=(p) + self.original_project = (p) else - self.original_project=value + self.original_project = value end end @@ -387,5 +385,4 @@ class Todo < ApplicationRecord super end - end diff --git a/app/models/todos/calendar.rb b/app/models/todos/calendar.rb index d208f660..152e572b 100644 --- a/app/models/todos/calendar.rb +++ b/app/models/todos/calendar.rb @@ -1,6 +1,5 @@ module Todos class Calendar - attr_reader :user, :included_tables def initialize(user) @@ -48,11 +47,10 @@ module Todos @end_of_the_month ||= today.end_of_month end - private + private def actions user.todos.not_completed.includes(included_tables).reorder("due") end - end end diff --git a/app/models/todos/undone_todos_query.rb b/app/models/todos/undone_todos_query.rb index c6d107ab..c8e5b95b 100644 --- a/app/models/todos/undone_todos_query.rb +++ b/app/models/todos/undone_todos_query.rb @@ -15,8 +15,8 @@ module Todos end not_done_todos = not_done_todos. - reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")). - includes(Todo::DEFAULT_INCLUDES) + reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) + .includes(Todo::DEFAULT_INCLUDES) not_done_todos = not_done_todos.limit(sanitize(params[:limit])) if params[:limit] diff --git a/app/models/user.rb b/app/models/user.rb index 61c22e98..b2dc34cc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -22,7 +22,7 @@ class User < ApplicationRecord end end - has_many(:projects, -> {order 'projects.position ASC'}, dependent: :delete_all) do + has_many(:projects, -> { order 'projects.position ASC' }, dependent: :delete_all) do def find_by_params(params) find(params['id'] || params['project_id']) end @@ -46,7 +46,7 @@ class User < ApplicationRecord projects = self.projects_in_state_by_position(project.state) position = projects.index(project) return nil if position == 0 && offset < 0 - projects.at( position + offset) + projects.at(position + offset) end def cache_note_counts project_note_counts = Note.group(:project_id).count @@ -64,9 +64,9 @@ class User < ApplicationRecord todos_in_project = where(scope_conditions).includes(:todos) todos_in_project = todos_in_project.sort_by { |x| [-x.todos.active.count, -x.id] } todos_in_project.reject{ |p| p.todos.active.count > 0 } - sorted_project_ids = todos_in_project.map {|p| p.id} + sorted_project_ids = todos_in_project.map { |p| p.id } - all_project_ids = self.map {|p| p.id} + all_project_ids = self.map { |p| p.id } other_project_ids = all_project_ids - sorted_project_ids update_positions(sorted_project_ids + other_project_ids) @@ -82,12 +82,12 @@ class User < ApplicationRecord end has_many :recurring_todos, - -> {order 'recurring_todos.completed_at DESC, recurring_todos.created_at DESC'}, + -> { order 'recurring_todos.completed_at DESC, recurring_todos.created_at DESC' }, dependent: :delete_all has_many(:deferred_todos, - -> { where('state = ?', 'deferred'). - order('show_from ASC, todos.created_at DESC')}, + -> { where('state = ?', 'deferred') + .order('show_from ASC, todos.created_at DESC') }, :class_name => 'Todo') do def find_and_activate_ready where('show_from <= ?', Time.current).collect { |t| t.activate! } @@ -196,7 +196,7 @@ class User < ApplicationRecord BCrypt::Password.create(s) end -protected + protected def crypt_password return if password.blank? @@ -218,5 +218,4 @@ protected taggings = Tagging.where(taggable_id: ids).pluck(:id) Tagging.where(id: taggings).delete_all end - end diff --git a/app/services/rich_message_extractor.rb b/app/services/rich_message_extractor.rb index 9b19a855..435d0520 100644 --- a/app/services/rich_message_extractor.rb +++ b/app/services/rich_message_extractor.rb @@ -72,5 +72,4 @@ class RichMessageExtractor def fix_date_string yymmdd "20#{yymmdd[0..1]}-#{yymmdd[2..3]}-#{yymmdd[4..5]} 00:00" end - end diff --git a/app/services/todo_from_rich_message.rb b/app/services/todo_from_rich_message.rb index bf567797..01212944 100644 --- a/app/services/todo_from_rich_message.rb +++ b/app/services/todo_from_rich_message.rb @@ -1,5 +1,4 @@ class TodoFromRichMessage - attr_reader :user, :default_context_id, :description, :notes def initialize(user, default_context_id, description, notes) @@ -21,8 +20,9 @@ class TodoFromRichMessage context_id = default_context_id if context.present? - found_context = user.contexts.active.where("name like ?", "%#{context}%").first - found_context = user.contexts.where("name like ?", "%#{context}%").first if !found_context + # TODO: Should this use ILIKE on Postgres? + found_context = user.contexts.active.where("name LIKE ?", "%#{context}%").first + found_context = user.contexts.where("name LIKE ?", "%#{context}%").first if !found_context context_id = found_context.id if found_context end diff --git a/public/dispatch.fcgi b/public/dispatch.fcgi index cd3edf47..04990df5 100755 --- a/public/dispatch.fcgi +++ b/public/dispatch.fcgi @@ -7,17 +7,17 @@ require 'rack' require 'fcgi' class Rack::PathInfoRewriter - def initialize(app) - @app = app - end + def initialize(app) + @app = app + end - def call(env) - env.delete('SCRIPT_NAME') - parts = env['REQUEST_URI'].split('?') - env['PATH_INFO'] = parts[0] - env['QUERY_STRING'] = parts[1].to_s - @app.call(env) - end + def call(env) + env.delete('SCRIPT_NAME') + parts = env['REQUEST_URI'].split('?') + env['PATH_INFO'] = parts[0] + env['QUERY_STRING'] = parts[1].to_s + @app.call(env) + end end Rack::Handler::FastCGI.run Rack::PathInfoRewriter.new(Tracksapp::Application) diff --git a/public/dispatch.rb b/public/dispatch.rb index ce705d36..bd5a6f68 100755 --- a/public/dispatch.rb +++ b/public/dispatch.rb @@ -7,4 +7,5 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ require "dispatcher" ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun) -Dispatcher.dispatch \ No newline at end of file +Dispatcher.dispatch + From 67a426a2e98c864832fbca2d1533bed3a870d1b0 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 10 Oct 2020 13:58:13 +0300 Subject: [PATCH 207/767] More code climate style fixes --- app/controllers/application_controller.rb | 4 +- app/controllers/todos_controller.rb | 12 ++--- app/helpers/application_helper.rb | 8 ++-- app/helpers/feedlist_helper.rb | 2 +- app/helpers/icon_helper.rb | 2 +- app/helpers/todos_helper.rb | 40 ++++++++-------- app/models/dependency.rb | 2 +- app/models/message_gateway.rb | 10 ++-- app/models/project.rb | 4 +- .../abstract_recurrence_pattern.rb | 12 +++-- .../monthly_recurrence_pattern.rb | 2 +- .../recurring_todos_builder.rb | 4 +- .../weekly_recurrence_pattern.rb | 8 ++-- .../yearly_recurrence_pattern.rb | 6 +-- .../yearly_recurring_todos_builder.rb | 2 +- app/models/stats/actions.rb | 42 ++++++++--------- app/models/stats/tag_cloud.rb | 2 +- app/models/todo.rb | 10 ++-- app/models/todos/undone_todos_query.rb | 4 +- app/models/user.rb | 47 +++++++++++-------- lib/common.rb | 2 +- lib/done_todos.rb | 11 ++--- lib/is_taggable.rb | 6 +-- lib/login_system.rb | 7 +-- lib/staleness.rb | 3 +- lib/tracks/attribute_handler.rb | 31 ++++++------ lib/tracks/config.rb | 8 +--- lib/tracks/source_view.rb | 38 ++++++--------- 28 files changed, 157 insertions(+), 172 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3b955e39..e33d8d3e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -219,14 +219,14 @@ class ApplicationController < ActionController::Base end end - def init_not_done_counts(parents=['project', 'context']) + def init_not_done_counts(parents = ['project', 'context']) parents.each do |parent| eval("@#{parent}_not_done_counts ||= current_user.todos.active.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__) eval("@#{parent}_deferred_counts ||= current_user.todos.deferred.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__) end end - def init_hidden_todo_counts(parents=['project', 'context']) + def init_hidden_todo_counts(parents = ['project', 'context']) parents.each do |parent| eval("@#{parent}_hidden_todo_counts ||= current_user.todos.active_or_hidden.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__) end diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index aa4a3c08..4734d85c 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -758,7 +758,7 @@ class TodosController < ApplicationController end end - def get_not_completed_for_predecessor(relation, todo_id=nil) + def get_not_completed_for_predecessor(relation, todo_id = nil) items = relation.todos.not_completed .where('(LOWER(todos.description) ' + Common.like_operator + '?)', "%#{params[:term].downcase}%") items = items.where("AND NOT(todos.id=?)", todo_id) unless todo_id.nil? @@ -984,7 +984,7 @@ end return todos_in_container, todos_in_target_container end - def determine_remaining_in_container_count(todo=@todo) + def determine_remaining_in_container_count(todo = @todo) source_view do |from| from.deferred { todos_in_container, todos_in_target_container = find_todos_in_container_and_target_container(todo, @todo) @@ -1282,22 +1282,22 @@ end end # all completed todos [today@00:00, today@now] - def get_done_today(completed_todos, includes={ :include => Todo::DEFAULT_INCLUDES }) + def get_done_today(completed_todos, includes = { :include => Todo::DEFAULT_INCLUDES }) start_of_this_day = Time.zone.now.beginning_of_day completed_todos.completed_after(start_of_this_day).includes(includes[:include]) end - def get_done_in_period(completed_todos, 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 }) + def get_done_rest_of_week(completed_todos, includes = { :include => Todo::DEFAULT_INCLUDES }) 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 }) + def get_done_rest_of_month(completed_todos, includes = { :include => Todo::DEFAULT_INCLUDES }) get_done_in_period(completed_todos, Time.zone.now.beginning_of_week, Time.zone.now.beginning_of_month) end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 225b45ae..baa0cdb6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -61,7 +61,7 @@ module ApplicationHelper link_to(descriptor, project, :title => "View project: #{project.name}") end - def link_to_edit_note (note, descriptor = sanitize(note.id.to_s)) + def link_to_edit_note(note, descriptor = sanitize(note.id.to_s)) link_to(descriptor, edit_note_path(note), { :id => "link_edit_#{dom_id(note)}", :class => "note_edit_settings" }) end @@ -207,7 +207,7 @@ module ApplicationHelper end end - def link_to_delete(type, object, descriptor=sanitize(object.name)) + def link_to_delete(type, object, descriptor = sanitize(object.name)) link_to(descriptor, self.send("#{type}_path", object, :format => 'js'), { :id => "delete_#{type}_#{object.id}", @@ -228,7 +228,7 @@ module ApplicationHelper def source_view_key # uses @project.id or @context.id depending on source_view - source_view_is_one_of(:project, :context) ? "#{@source_view}-#{eval("@#{@source_view}.id")}" : @source_view + source_view_is_one_of(:project, :context) ? "#{@source_view}-#{eval("@#{@source_view}.id", binding, __FILE__, __LINE__)}" : @source_view end # create a unique object name which can be used in ajax calls returning js @@ -237,7 +237,7 @@ module ApplicationHelper "#{name}_#{SecureRandom.hex(5)}" end - def js_render(partial, locals={}, object=nil) + def js_render(partial, locals = {}, object = nil) if object escape_javascript(render(partial: partial, locals: locals, object: object)) else diff --git a/app/helpers/feedlist_helper.rb b/app/helpers/feedlist_helper.rb index 9f42a1fd..4a912a83 100644 --- a/app/helpers/feedlist_helper.rb +++ b/app/helpers/feedlist_helper.rb @@ -13,7 +13,7 @@ module FeedlistHelper end def ical_formatted_link(options = {}) - link_to(content_tag(:span, 'iCal', { :class=>"feed", :title => "iCal feed" }), linkoptions('ics', options)) + link_to(content_tag(:span, 'iCal', { :class => "feed", :title => "iCal feed" }), linkoptions('ics', options)) end def feed_links(feeds, link_options, title) diff --git a/app/helpers/icon_helper.rb b/app/helpers/icon_helper.rb index c35ed8f6..108a9e9b 100644 --- a/app/helpers/icon_helper.rb +++ b/app/helpers/icon_helper.rb @@ -1,7 +1,7 @@ module IconHelper include FontAwesome::Sass::Rails::ViewHelpers - def icon_fw(style, name, text=nil, html_options={}) + def icon_fw(style, name, text = nil, html_options = {}) text, html_options = nil, text if text.is_a?(Hash) if html_options.key?(:class) diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index a82e1ed5..6e9f7d8f 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -2,7 +2,7 @@ require 'staleness' module TodosHelper # === helpers for rendering container - def empty_message_holder(container_name, show, title_param=nil) + def empty_message_holder(container_name, show, title_param = nil) content_tag(:div, :id => "no_todos_in_view", :class => "container #{container_name}", :style => "display:" + (show ? "block" : "none") ) do content_tag(:h2) { t("todos.no_actions.title", :param=>title_param) } + content_tag(:div, :class => "message") do @@ -41,7 +41,7 @@ module TodosHelper } end - def show_done_todos(done_todos, settings={}) + def show_done_todos(done_todos, settings = {}) settings[:container_name] = "completed" settings[:link_in_header] = link_to(t('common.show_all'), determine_done_path) @@ -63,7 +63,7 @@ module TodosHelper :locals => { :settings => settings } end - def show_hidden_todos(hidden_todos, settings={}) + def show_hidden_todos(hidden_todos, settings = {}) settings[:container_name] = "hidden" render :partial => 'todos/collection', @@ -71,7 +71,7 @@ module TodosHelper :locals => { :settings => settings.reverse_merge!(default_collection_settings) } end - def show_deferred_pending_todos(deferred_todos, pending_todos, settings={}) + def show_deferred_pending_todos(deferred_todos, pending_todos, settings = {}) settings[:pending] = pending_todos settings[:container_name]="deferred_pending" @@ -91,7 +91,7 @@ module TodosHelper } end - def todos_container(settings={}) + def todos_container(settings = {}) settings.reverse_merge!({ :id => "#{settings[:container_name]}_container", :class => "container #{settings[:container_name]}", @@ -109,7 +109,7 @@ module TodosHelper end end - def todos_container_header(settings={}) + def todos_container_header(settings = {}) settings.reverse_merge!({ :title => t("todos.actions.#{settings[:parent_container_type]}_#{settings[:container_name]}", :param => settings[:title_param]) }) @@ -122,7 +122,7 @@ module TodosHelper header.html_safe end - def todos_container_items(collection, settings={}) + def todos_container_items(collection, settings = {}) settings.reverse_merge!({:id => "#{settings[:container_name]}"}) # do not pass :class to partial locals settings.delete(:class) @@ -146,13 +146,13 @@ module TodosHelper # === helpers for rendering a todo - def remote_star_icon(todo=@todo) + def remote_star_icon(todo = @todo) link_to(image_tag_for_star(todo), toggle_star_todo_path(todo), :class => "icon star_item", :title => t('todos.star_action_with_description', :description => todo.description)) end - def remote_edit_button(todo=@todo) + def remote_edit_button(todo = @todo) link_to( image_tag("blank.png", :alt => t('todos.edit'), :align => "absmiddle", :id => dom_id(todo, "edit_icon"), :class => 'edit_item'), edit_todo_path(todo), @@ -244,18 +244,18 @@ module TodosHelper image_tag("blank.png", :title => t('todos.star_action'), :class => "todo_star" + (todo.starred? ? " starred" : ""), :id => "star_img_" + todo.id.to_s) end - def remote_toggle_checkbox(todo=@todo) + def remote_toggle_checkbox(todo = @todo) check_box_tag("mark_complete_#{todo.id}", toggle_check_todo_path(todo), todo.completed?, :class => 'item-checkbox', :title => todo.pending? ? t('todos.blocked_by', :predecessors => todo.uncompleted_predecessors.to_a.map(&:description).join(', ')) : "", :readonly => todo.pending?) end - def remote_mobile_checkbox(todo=@todo) + def remote_mobile_checkbox(todo = @todo) form_tag toggle_check_todo_path(@todo, :format => 'm'), :method => :put, :class => "mobile-done", :name => "mobile_complete_#{@todo.id}" do check_box_tag('_source_view', 'todo', @todo && @todo.completed?, "onClick" => "document.mobile_complete_#{@todo.id}.submit()") end end - def date_span(todo=@todo) + def date_span(todo = @todo) if todo.completed? content_tag(:span, { :class => :grey }) { format_date( todo.completed_at ) } elsif todo.pending? @@ -268,7 +268,7 @@ module TodosHelper end end - def successors_span(todo=@todo) + def successors_span(todo = @todo) unless todo.pending_successors.empty? pending_count = todo.pending_successors.count title = "#{t('todos.has_x_pending', :count => pending_count)}: #{todo.pending_successors.to_a.map(&:description).join(', ')}" @@ -276,7 +276,7 @@ module TodosHelper end end - def grip_span(todo=@todo) + def grip_span(todo = @todo) unless todo.completed? image_tag('grip.png', :width => '7', :height => '16', :border => '0', :title => t('todos.drag_action_title'), @@ -284,23 +284,23 @@ module TodosHelper end end - def tag_list_text(todo=@todo) + def tag_list_text(todo = @todo) todo.tags.to_a.join(', ') end - def tag_span(tag, mobile=false) + def tag_span(tag, mobile = false) content_tag(:span, :class => "tag #{tag.label}") { link_to(tag.name, tag_path(tag.name, :format => mobile ? :m : nil)) } end - def tag_list(todo=@todo, mobile=false) + def tag_list(todo=@todo, mobile = false) content_tag(:span, :class => 'tags') { todo.tags.all_except_starred.collect{ |tag| tag_span(tag, mobile) }.join('').html_safe } end - def tag_list_mobile(todo=@todo) + def tag_list_mobile(todo = @todo) todo.tags.all_except_starred.empty? ? "" : tag_list(todo, true) end - def deferred_due_date(todo=@todo) + def deferred_due_date(todo = @todo) t('todos.action_due_on', :date => format_date(todo.due)) if todo.deferred? && todo.due end @@ -417,7 +417,7 @@ module TodosHelper # animation steps. # if the animation needs to be run inside the namespace of an object, set the # object_name to the name of the object and this name will be prepended to each step - def render_animation(animation, object_name=nil) + def render_animation(animation, object_name = nil) object_name += "." unless object_name.nil? # add dot if object_name is given # concatenate all steps into functions that call functions diff --git a/app/models/dependency.rb b/app/models/dependency.rb index 7664b910..84f96cd6 100644 --- a/app/models/dependency.rb +++ b/app/models/dependency.rb @@ -1,7 +1,7 @@ class Dependency < ApplicationRecord # touch to make sure todo caches for predecessor and successor are invalidated belongs_to :predecessor, :foreign_key => 'predecessor_id', :class_name => 'Todo', :touch => true - belongs_to :successor, :foreign_key => 'successor_id', :class_name => 'Todo', :touch => true + belongs_to :successor, :foreign_key => 'successor_id', :class_name => 'Todo', :touch => true validate :check_circular_dependencies diff --git a/app/models/message_gateway.rb b/app/models/message_gateway.rb index 8d66913b..38278297 100644 --- a/app/models/message_gateway.rb +++ b/app/models/message_gateway.rb @@ -26,7 +26,7 @@ class MessageGateway < ActionMailer::Base attachment = todo.attachments.build # create temp file - tmp = Tempfile.new(['attachment', '.eml'], {universal_newline: true}) + tmp = Tempfile.new(['attachment', '.eml'], { universal_newline: true }) tmp.write email.raw_source.gsub(/\r/, "") # add temp file to attachment. paperclip will copy the file to the right location @@ -74,13 +74,13 @@ class MessageGateway < ActionMailer::Base end def get_receiving_user_from_mail_header(email) - user = get_receiving_user_from_sms_email( get_address(email) ) + user = get_receiving_user_from_sms_email(get_address(email)) Rails.logger.info(user.nil? ? "User unknown": "Email belongs to #{user.login}") return user end def get_address(email) - return SITE_CONFIG['email_dispatch'] == 'to' ? email.to[0] : email.from[0] + return SITE_CONFIG['email_dispatch'] == 'to' ? email.to[0] : email.from[0] end def get_receiving_user_from_sms_email(address) @@ -91,7 +91,7 @@ class MessageGateway < ActionMailer::Base end def check_sender_is_in_mailmap(user, email) - if user.present? and !sender_is_in_mailmap?(user,email) + if user.present? && !sender_is_in_mailmap?(user, email) Rails.logger.warn "#{email.from[0]} not found in mailmap for #{user.login}" return false end @@ -122,7 +122,7 @@ class MessageGateway < ActionMailer::Base parts = get_all_parts(email.parts) # remove all parts that are not text/plain - parts.reject{|part| !part.content_type.start_with?("text/plain") } + parts.reject { |part| !part.content_type.start_with?("text/plain") } return parts.count > 0 ? parts[0].decoded.strip : "" end diff --git a/app/models/project.rb b/app/models/project.rb index 47b52bfd..0820f10f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -49,7 +49,7 @@ class Project < ApplicationRecord end def set_last_reviewed_now - self.last_reviewed = Time.now + self.last_reviewed = Time.zone.now end def set_completed_at_date @@ -105,7 +105,7 @@ class Project < ApplicationRecord return !self.todos.deferred_or_blocked.exists? && !self.todos.active.exists? end - def shortened_name(length=40) + def shortened_name(length = 40) name.truncate(length, :omission => "...").html_safe end diff --git a/app/models/recurring_todos/abstract_recurrence_pattern.rb b/app/models/recurring_todos/abstract_recurrence_pattern.rb index e2c2364d..3e5d016d 100644 --- a/app/models/recurring_todos/abstract_recurrence_pattern.rb +++ b/app/models/recurring_todos/abstract_recurrence_pattern.rb @@ -44,9 +44,13 @@ module RecurringTodos def xth(x) xth_day = [ - I18n.t('todos.recurrence.pattern.first'),I18n.t('todos.recurrence.pattern.second'),I18n.t('todos.recurrence.pattern.third'), - I18n.t('todos.recurrence.pattern.fourth'),I18n.t('todos.recurrence.pattern.last')] - x.nil? ? '??' : xth_day[x-1] + I18n.t('todos.recurrence.pattern.first'), + I18n.t('todos.recurrence.pattern.second'), + I18n.t('todos.recurrence.pattern.third'), + I18n.t('todos.recurrence.pattern.fourth'), + I18n.t('todos.recurrence.pattern.last'), + ] + x.nil? ? '??' : xth_day[x - 1] end def day_of_week_as_text(day) @@ -170,7 +174,7 @@ module RecurringTodos # takes start_from and previous into account. # offset needs to be 1.day for daily patterns or the start will be the # same day as the previous - def determine_start(previous, offset=0.day) + def determine_start(previous, offset = 0.day) start = self.start_from || NullTime.new if previous # check if the start_from date is later than previous. If so, use diff --git a/app/models/recurring_todos/monthly_recurrence_pattern.rb b/app/models/recurring_todos/monthly_recurrence_pattern.rb index 6ae064dc..368ac2de 100644 --- a/app/models/recurring_todos/monthly_recurrence_pattern.rb +++ b/app/models/recurring_todos/monthly_recurrence_pattern.rb @@ -32,7 +32,7 @@ module RecurringTodos get(:recurrence_selector) == 1 ? get(:every_other2) : 1 end - def every_xth_day(default=nil) + def every_xth_day(default = nil) get(:every_other3) || default end diff --git a/app/models/recurring_todos/recurring_todos_builder.rb b/app/models/recurring_todos/recurring_todos_builder.rb index 36412d62..2819928d 100644 --- a/app/models/recurring_todos/recurring_todos_builder.rb +++ b/app/models/recurring_todos/recurring_todos_builder.rb @@ -2,7 +2,7 @@ module RecurringTodos class RecurringTodosBuilder attr_reader :builder, :project, :context, :tag_list, :user - def initialize (user, attributes) + def initialize(user, attributes) @user = user @attributes = Tracks::AttributeHandler.new(@user, attributes) @@ -60,7 +60,7 @@ module RecurringTodos end def parse_dates - %w{end_date start_from}.each {|date| @attributes.parse_date date } + %w{end_date start_from}.each { |date| @attributes.parse_date date } end def parse_project diff --git a/app/models/recurring_todos/weekly_recurrence_pattern.rb b/app/models/recurring_todos/weekly_recurrence_pattern.rb index 60feef15..c5824d30 100644 --- a/app/models/recurring_todos/weekly_recurrence_pattern.rb +++ b/app/models/recurring_todos/weekly_recurrence_pattern.rb @@ -41,7 +41,7 @@ module RecurringTodos # we did not find anything this week, so check the nth next, starting from # sunday - start = start + self.every_x_week.week - (start.wday()).days + start = start + self.every_x_week.week - (start.wday).days start = find_first_day_in_this_week(start) return start unless start == -1 @@ -56,7 +56,7 @@ module RecurringTodos return self.start_from || Time.zone.now else start = previous + 1.day - if start.wday() == 0 + if start.wday == 0 # we went to a new week, go to the nth next week and find first match # that week. Note that we already went into the next week, so -1 start += (every_x_week - 1).week @@ -72,8 +72,8 @@ module RecurringTodos def find_first_day_in_this_week(start) # check if there are any days left this week for the next todo - start.wday().upto 6 do |i| - return start + (i - start.wday()).days if on_xday(i) + start.wday.upto 6 do |i| + return start + (i - start.wday).days if on_xday(i) end -1 end diff --git a/app/models/recurring_todos/yearly_recurrence_pattern.rb b/app/models/recurring_todos/yearly_recurrence_pattern.rb index 06cdec59..3c53c6c5 100644 --- a/app/models/recurring_todos/yearly_recurrence_pattern.rb +++ b/app/models/recurring_todos/yearly_recurrence_pattern.rb @@ -81,7 +81,7 @@ module RecurringTodos if start.month > month || (start.month == month && start.day >= every_x_day) # if there is no next month n and day m in this year, search in next # year - start = Time.zone.local(start.year+1, month, 1) + start = Time.zone.local(start.year + 1, month, 1) else # if there is a next month n, stay in this year start = Time.zone.local(start.year, month, 1) @@ -91,14 +91,14 @@ module RecurringTodos def get_relative_weekday_of_month(start, month) # if there is no next month n in this year, search in next year - the_next = start.month > month ? Time.zone.local(start.year+1, month, 1) : start + the_next = start.month > month ? Time.zone.local(start.year + 1, month, 1) : start # get the xth day of the month the_next = get_xth_day_of_month(self.every_xth_day, day_of_week, month, the_next.year) # if the_next is before previous, we went back into the past, so try next # year - the_next = get_xth_day_of_month(self.every_xth_day, day_of_week, month, start.year+1) if the_next <= start + the_next = get_xth_day_of_month(self.every_xth_day, day_of_week, month, start.year + 1) if the_next <= start the_next end diff --git a/app/models/recurring_todos/yearly_recurring_todos_builder.rb b/app/models/recurring_todos/yearly_recurring_todos_builder.rb index 0e8cfa5e..670db516 100644 --- a/app/models/recurring_todos/yearly_recurring_todos_builder.rb +++ b/app/models/recurring_todos/yearly_recurring_todos_builder.rb @@ -32,7 +32,7 @@ module RecurringTodos end def get_recurrence_selector - @selector=='yearly_every_x_day' ? 0 : 1 + @selector == 'yearly_every_x_day' ? 0 : 1 end def get_every_other2 diff --git a/app/models/stats/actions.rb b/app/models/stats/actions.rb index 3f29eccc..6193084a 100644 --- a/app/models/stats/actions.rb +++ b/app/models/stats/actions.rb @@ -89,7 +89,7 @@ module Stats created_count_array = Array.new(30) { |i| @actions_created_last30days.size / 30.0 } done_count_array = Array.new(30) { |i| @actions_done_last30days.size / 30.0 } # TODO: make the strftime i18n proof - time_labels = Array.new(30) { |i| I18n.l(Time.zone.now-i.days, :format => :stats) } + time_labels = Array.new(30) { |i| I18n.l(Time.zone.now - i.days, :format => :stats) } return { datasets: [ @@ -103,11 +103,11 @@ module Stats end def completion_time_data - @actions_completion_time = @user.todos.completed.select("completed_at, created_at").reorder("completed_at DESC" ) + @actions_completion_time = @user.todos.completed.select("completed_at, created_at").reorder("completed_at DESC") # convert to array and fill in non-existing weeks with 0 @max_weeks = @actions_completion_time.last ? difference_in_weeks(@today, @actions_completion_time.last.completed_at) : 1 - @actions_completed_per_week_array = convert_to_weeks_running_array(@actions_completion_time, @max_weeks+1) + @actions_completed_per_week_array = convert_to_weeks_running_array(@actions_completion_time, @max_weeks + 1) # stop the chart after 10 weeks @count = [10, @max_weeks].min @@ -119,7 +119,7 @@ module Stats # get percentage done cumulative @cum_percent_done = convert_to_cumulative_array(@actions_completion_time_array, @actions_completion_time.count(:all)) - time_labels = Array.new(@count) { |i| "#{i}-#{i+1}" } + time_labels = Array.new(@count) { |i| "#{i}-#{i + 1}" } time_labels[0] = I18n.t('stats.within_one') time_labels[@count] = "> #{@count}" @@ -137,7 +137,7 @@ module Stats # convert to array and fill in non-existing weeks with 0 @max_weeks = difference_in_weeks(@today, @actions_running_time.last.created_at) - @actions_running_per_week_array = convert_to_weeks_from_today_array(@actions_running_time, @max_weeks+1, :created_at) + @actions_running_per_week_array = convert_to_weeks_from_today_array(@actions_running_time, @max_weeks + 1, :created_at) # cut off chart at 52 weeks = one year @count = [52, @max_weeks].min @@ -147,9 +147,9 @@ module Stats @max_actions = @actions_running_time_array.max # get percentage done cumulative - @cum_percent_done = convert_to_cumulative_array(@actions_running_time_array, @actions_running_time.count ) + @cum_percent_done = convert_to_cumulative_array(@actions_running_time_array, @actions_running_time.count) - time_labels = Array.new(@count) { |i| "#{i}-#{i+1}" } + time_labels = Array.new(@count) { |i| "#{i}-#{i + 1}" } time_labels[0] = "< 1" time_labels[@count] = "> #{@count}" @@ -186,9 +186,9 @@ module Stats @max_actions = @actions_running_time_array.max # get percentage done cumulative - @cum_percent_done = convert_to_cumulative_array(@actions_running_time_array, @actions_running_time.count ) + @cum_percent_done = convert_to_cumulative_array(@actions_running_time_array, @actions_running_time.count) - time_labels = Array.new(@count) { |i| "#{i}-#{i+1}" } + time_labels = Array.new(@count) { |i| "#{i}-#{i + 1}" } time_labels[0] = "< 1" time_labels[@count] = "> #{@count}" @@ -211,10 +211,10 @@ module Stats # cut off chart at 52 weeks = one year @count = [52, @max_weeks].min - @actions_open_per_week_array = convert_to_weeks_running_from_today_array(@actions_started, @max_weeks+1) + @actions_open_per_week_array = convert_to_weeks_running_from_today_array(@actions_started, @max_weeks + 1) @actions_open_per_week_array = cut_off_array(@actions_open_per_week_array, @count) - time_labels = Array.new(@count+1) { |i| "#{i}-#{i+1}" } + time_labels = Array.new(@count + 1) { |i| "#{i}-#{i + 1}" } time_labels[0] = "< 1" return { @@ -252,7 +252,7 @@ module Stats @actions_completion_day = @user.todos.completed_after(@cut_off_month).select("completed_at") # convert to hash to be able to fill in non-existing days - @max=0 + @max = 0 @actions_creation_day_array = Array.new(7) { |i| 0 } @actions_creation_day.each { |r| @actions_creation_day_array[r.created_at.wday] += 1 } @@ -275,11 +275,11 @@ module Stats # convert to hash to be able to fill in non-existing days @actions_creation_hour_array = Array.new(24) { |i| 0 } - @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 } + @actions_creation_hour.each { |r| @actions_creation_hour_array[r.created_at.hour] += 1 } # convert to hash to be able to fill in non-existing days @actions_completion_hour_array = Array.new(24) { |i| 0 } - @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 } + @actions_completion_hour.each { |r| @actions_completion_hour_array[r.completed_at.hour] += 1 } return { datasets: [ @@ -296,11 +296,11 @@ module Stats # convert to hash to be able to fill in non-existing days @actions_creation_hour_array = Array.new(24) { |i| 0 } - @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 } + @actions_creation_hour.each { |r| @actions_creation_hour_array[r.created_at.hour] += 1 } # convert to hash to be able to fill in non-existing days @actions_completion_hour_array = Array.new(24) { |i| 0 } - @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 } + @actions_completion_hour.each { |r| @actions_completion_hour_array[r.completed_at.hour] += 1 } return { datasets: [ @@ -393,7 +393,7 @@ module Stats # calculate fractions a = Array.new(array.size) {|i| array[i] * 100.0 / max} # make cumulative - 1.upto(array.size-1) { |i| a[i] += a[i - 1] } + 1.upto(array.size - 1) { |i| a[i] += a[i - 1] } return a end @@ -412,7 +412,7 @@ module Stats end def three_month_avg(set, i) - (set.fetch(i) { 0 } + set.fetch(i+1) { 0 } + set.fetch(i + 2) { 0 }) / 3.0 + (set.fetch(i) { 0 } + set.fetch(i + 1) { 0 } + set.fetch(i + 2) { 0 }) / 3.0 end def set_three_month_avg(set, upper_bound) @@ -421,14 +421,14 @@ module Stats def compute_running_avg_array(set, upper_bound) result = set_three_month_avg(set, upper_bound) - result[upper_bound - 1] = result[upper_bound-1] * 3 if upper_bound == set.length - result[upper_bound - 2] = result[upper_bound-2] * 3 / 2 if upper_bound > 1 and upper_bound == set.length + result[upper_bound - 1] = result[upper_bound - 1] * 3 if upper_bound == set.length + result[upper_bound - 2] = result[upper_bound - 2] * 3 / 2 if upper_bound > 1 and upper_bound == set.length result[0] = "null" result end # unsolved, not triggered, edge case for set.length == upper_bound + 1 def month_label(i) - I18n.t('date.month_names')[(Time.zone.now.mon - i -1 ) % 12 + 1] + I18n.t('date.month_names')[(Time.zone.now.mon - i - 1) % 12 + 1] end def array_of_month_labels(count) diff --git a/app/models/stats/tag_cloud.rb b/app/models/stats/tag_cloud.rb index 5fe74d11..7637baa2 100644 --- a/app/models/stats/tag_cloud.rb +++ b/app/models/stats/tag_cloud.rb @@ -32,7 +32,7 @@ module Stats end def counts - @counts ||= tags.map { |t| t.count } + @counts ||= tags.map(&:count) end end end diff --git a/app/models/todo.rb b/app/models/todo.rb index 3c51320f..043dbbdd 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -64,8 +64,8 @@ class Todo < ApplicationRecord where('todos.due > ? AND todos.due <= ?', start_date, end_date) end - STARRED_TAG_NAME = "starred" - DEFAULT_INCLUDES = [:project, :context, :tags, :taggings, :pending_successors, :uncompleted_predecessors, :recurring_todo] + STARRED_TAG_NAME = "starred".freeze + DEFAULT_INCLUDES = [:project, :context, :tags, :taggings, :pending_successors, :uncompleted_predecessors, :recurring_todo].freeze # state machine include AASM @@ -149,7 +149,7 @@ class Todo < ApplicationRecord end def save_predecessors - unless @predecessor_array.nil? # Only save predecessors if they changed + unless @predecessor_array.nil? # Only save predecessors if they changed current_array = self.predecessors remove_array = current_array - @predecessor_array add_array = @predecessor_array - current_array @@ -245,7 +245,7 @@ class Todo < ApplicationRecord end def toggle_star! - self.starred= !starred? + self.starred = !starred? end def starred=(starred) @@ -313,7 +313,7 @@ class Todo < ApplicationRecord alias_method :original_context=, :context= def context=(value) if value.is_a? Context - self.original_context=(value) + self.original_context = (value) else c = Context.where(:name => value[:name]).first c = Context.create(value) if c.nil? diff --git a/app/models/todos/undone_todos_query.rb b/app/models/todos/undone_todos_query.rb index c8e5b95b..43f01527 100644 --- a/app/models/todos/undone_todos_query.rb +++ b/app/models/todos/undone_todos_query.rb @@ -14,8 +14,8 @@ module Todos not_done_todos = current_user.todos.active.not_hidden end - not_done_todos = not_done_todos. - reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) + not_done_todos = not_done_todos + .reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) .includes(Todo::DEFAULT_INCLUDES) not_done_todos = not_done_todos.limit(sanitize(params[:limit])) if params[:limit] diff --git a/app/models/user.rb b/app/models/user.rb index b2dc34cc..e5d27c51 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -13,60 +13,69 @@ class User < ApplicationRecord def find_by_params(params) find(params['id'] || params['context_id']) || nil end + def update_positions(context_ids) - context_ids.each_with_index {|id, position| - context = self.detect { |c| c.id == id.to_i } - raise I18n.t('models.user.error_context_not_associated', :context => id, :user => @user.id) if context.nil? - context.update_attribute(:position, position + 1) - } - end + context_ids.each_with_index { |id, position| + context = self.detect { |c| c.id == id.to_i } + raise I18n.t('models.user.error_context_not_associated', :context => id, :user => @user.id) if context.nil? + context.update_attribute(:position, position + 1) + } + end end has_many(:projects, -> { order 'projects.position ASC' }, dependent: :delete_all) do def find_by_params(params) find(params['id'] || params['project_id']) end + def update_positions(project_ids) - project_ids.each_with_index {|id, position| + project_ids.each_with_index { |id, position| project = self.find_by(id: id.to_i) raise I18n.t('models.user.error_project_not_associated', :project => id, :user => @user.id) if project.nil? project.update_attribute(:position, position + 1) } end + def projects_in_state_by_position(state) - self.select{ |p| p.state == state }.sort_by{ |p| p.position } + self.select { |p| p.state == state }.sort_by { |p| p.position } end + def next_from(project) self.offset_from(project, 1) end + def previous_from(project) self.offset_from(project, -1) end + def offset_from(project, offset) projects = self.projects_in_state_by_position(project.state) position = projects.index(project) return nil if position == 0 && offset < 0 projects.at(position + offset) end + def cache_note_counts project_note_counts = Note.group(:project_id).count self.each do |project| project.cached_note_count = project_note_counts[project.id] || 0 end end + def alphabetize(scope_conditions = {}) projects = where(scope_conditions) projects = projects.sort_by { |project| project.name.downcase } - self.update_positions(projects.map{ |p| p.id }) + self.update_positions(projects.map(&:id)) return projects end + def actionize(scope_conditions = {}) todos_in_project = where(scope_conditions).includes(:todos) todos_in_project = todos_in_project.sort_by { |x| [-x.todos.active.count, -x.id] } - todos_in_project.reject{ |p| p.todos.active.count > 0 } - sorted_project_ids = todos_in_project.map { |p| p.id } + todos_in_project.reject { |p| p.todos.active.count > 0 } + sorted_project_ids = todos_in_project.map(&:id) - all_project_ids = self.map { |p| p.id } + all_project_ids = self.map(&:id) other_project_ids = all_project_ids - sorted_project_ids update_positions(sorted_project_ids + other_project_ids) @@ -76,9 +85,9 @@ class User < ApplicationRecord end has_many(:todos, -> { order 'todos.completed_at DESC, todos.created_at DESC' }, dependent: :delete_all) do - def count_by_group(g) - except(:order).group(g).count - end + def count_by_group(g) + except(:order).group(g).count + end end has_many :recurring_todos, @@ -89,9 +98,9 @@ class User < ApplicationRecord -> { where('state = ?', 'deferred') .order('show_from ASC, todos.created_at DESC') }, :class_name => 'Todo') do - def find_and_activate_ready - where('show_from <= ?', Time.current).collect { |t| t.activate! } - end + def find_and_activate_ready + where('show_from <= ?', Time.current).collect { |t| t.activate! } + end end has_many :tags, dependent: :delete_all @@ -157,7 +166,7 @@ class User < ApplicationRecord "#{first_name} #{last_name}" end - def change_password(pass,pass_confirm) + def change_password(pass, pass_confirm) self.password = pass self.password_confirmation = pass_confirm save! diff --git a/lib/common.rb b/lib/common.rb index 83105ed6..db7c8919 100644 --- a/lib/common.rb +++ b/lib/common.rb @@ -8,7 +8,7 @@ module Common end def self.like_operator - # This is something of a hack to use the correct operator for Pg + # HACK: This is something of a hack to use the correct operator for Pg if ActiveRecord::Base.connection.adapter_name.downcase.to_sym == :postgresql like = 'ILIKE' else diff --git a/lib/done_todos.rb b/lib/done_todos.rb index 413a9e08..f49a2a12 100644 --- a/lib/done_todos.rb +++ b/lib/done_todos.rb @@ -1,26 +1,24 @@ class DoneTodos - - 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 - def self.done_today(todos, includes = {:include => Todo::DEFAULT_INCLUDES}) + def self.done_today(todos, includes={ :include => Todo::DEFAULT_INCLUDES }) # TODO: refactor to remove outer hash from includes param todos.completed_after(beginning_of_day).includes(includes[:include]) end - def self.done_rest_of_week(todos, includes = {:include => Todo::DEFAULT_INCLUDES}) + def self.done_rest_of_week(todos, includes={ :include => Todo::DEFAULT_INCLUDES }) done_between(todos, includes, beginning_of_day, beginning_of_week) end - def self.done_rest_of_month(todos, includes = {:include => Todo::DEFAULT_INCLUDES}) + def self.done_rest_of_month(todos, includes={ :include => Todo::DEFAULT_INCLUDES }) done_between(todos, includes, beginning_of_week, beginning_of_month) end def self.completed_period(date) - return nil if date.nil? + return nil if date.nil? return "today" if date >= end_of_day # treat todos with completed_at in future as done today (happens in tests) return "today" if date.between?(beginning_of_day, end_of_day) @@ -57,5 +55,4 @@ class DoneTodos def self.beginning_of_month Time.zone.now.beginning_of_month end - end diff --git a/lib/is_taggable.rb b/lib/is_taggable.rb index 59944811..1c96a0c3 100644 --- a/lib/is_taggable.rb +++ b/lib/is_taggable.rb @@ -1,18 +1,16 @@ # These methods are adapted from has_many_polymorphs' tagging_extensions - module IsTaggable - def self.included(klass) klass.class_eval do - # Add tags associations has_many :taggings, :as => :taggable has_many :tags, :through => :taggings do def to_s self.to_a.map(&:name).sort.join(Tag::JOIN_DELIMITER) end + def all_except_starred - self.to_a.reject{|tag| tag.name == Todo::STARRED_TAG_NAME} + self.to_a.reject { |tag| tag.name == Todo::STARRED_TAG_NAME } end end diff --git a/lib/login_system.rb b/lib/login_system.rb index 85d1d3e0..cdaaa562 100644 --- a/lib/login_system.rb +++ b/lib/login_system.rb @@ -1,7 +1,6 @@ require_dependency "user" module LoginSystem - def current_user get_current_user end @@ -97,7 +96,6 @@ module LoginSystem # def authorize?(user) # def login_required - if not protect?(action_name) return true end @@ -125,7 +123,6 @@ module LoginSystem end def login_optional - login_from_cookie if session['user_id'] and authorize?(get_current_user) @@ -189,7 +186,6 @@ module LoginSystem # HTTP Basic auth code adapted from Coda Hale's simple_http_auth plugin. Thanks, Coda! def get_basic_auth_data - auth_locations = ['REDIRECT_REDIRECT_X_HTTP_AUTHORIZATION', 'REDIRECT_X_HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'HTTP_AUTHORIZATION'] @@ -216,7 +212,7 @@ module LoginSystem render :body => t('login.unsuccessful'), :status => 401 end -private + private # Redirect the user to the login page. def redirect_to_login @@ -226,5 +222,4 @@ private format.m { redirect_to login_path(:format => 'm') } end end - end diff --git a/lib/staleness.rb b/lib/staleness.rb index a3a02602..81874f7c 100644 --- a/lib/staleness.rb +++ b/lib/staleness.rb @@ -2,7 +2,7 @@ require 'active_support/all' require 'user_time' class Staleness - SECONDS_PER_DAY = 86400 + SECONDS_PER_DAY = 86_400 def self.days_stale(item, current_user) return 0 if cannot_be_stale(item, current_user) @@ -15,4 +15,3 @@ class Staleness false end end - diff --git a/lib/tracks/attribute_handler.rb b/lib/tracks/attribute_handler.rb index de50c965..246430c4 100644 --- a/lib/tracks/attribute_handler.rb +++ b/lib/tracks/attribute_handler.rb @@ -1,5 +1,4 @@ module Tracks - class AttributeHandler attr_reader :attributes @@ -10,7 +9,7 @@ module Tracks end def get(attribute) - @attributes[attribute.to_sym] + @attributes[attribute.to_sym] end def [](attribute) @@ -37,7 +36,7 @@ module Tracks @attributes.key?(key.to_sym) end - def selector_key_present?(key) + def selector_key_present?(key) key?(key) end @@ -78,9 +77,9 @@ module Tracks object = relation.build(:name => name) new_object_created = true end - + return object, new_object_created - end + end def specified_by_name?(object_type) self.send("#{object_type}_specified_by_name?") @@ -115,25 +114,23 @@ module Tracks ActionController::Parameters.new(attributes).permit( :context, :project, # model attributes - :context_id, :project_id, :description, :notes, :state, :start_from, + :context_id, :project_id, :description, :notes, :state, :start_from, :ends_on, :end_date, :number_of_occurrences, :occurrences_count, :target, - :show_from_delta, :recurring_period, :recurrence_selector, :every_other1, - :every_other2, :every_other3, :every_day, :only_work_days, :every_count, + :show_from_delta, :recurring_period, :recurrence_selector, :every_other1, + :every_other2, :every_other3, :every_day, :only_work_days, :every_count, :weekday, :show_always, :context_name, :project_name, :tag_list, # form attributes - :recurring_period, :daily_selector, :monthly_selector, :yearly_selector, - :recurring_target, :daily_every_x_days, :monthly_day_of_week, - :monthly_every_x_day, :monthly_every_x_month2, :monthly_every_x_month, - :monthly_every_xth_day, :recurring_show_days_before, + :recurring_period, :daily_selector, :monthly_selector, :yearly_selector, + :recurring_target, :daily_every_x_days, :monthly_day_of_week, + :monthly_every_x_day, :monthly_every_x_month2, :monthly_every_x_month, + :monthly_every_xth_day, :recurring_show_days_before, :recurring_show_always, :weekly_every_x_week, :weekly_return_monday, - :yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day, + :yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day, :yearly_month_of_year2, :yearly_month_of_year, # derived attributes - :weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday, + :weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday, :weekly_return_thursday, :weekly_return_friday, :weekly_return_saturday, :weekly_return_sunday - ) + ) end - end - end diff --git a/lib/tracks/config.rb b/lib/tracks/config.rb index f0412931..4015a4b4 100644 --- a/lib/tracks/config.rb +++ b/lib/tracks/config.rb @@ -1,11 +1,9 @@ module Tracks - class Config - def self.auth_schemes SITE_CONFIG['authentication_schemes'] || [] end - + def self.openid_enabled? auth_schemes.include?('open_id') end @@ -13,7 +11,7 @@ module Tracks def self.cas_enabled? auth_schemes.include?('cas') end - + def self.prefered_auth? if SITE_CONFIG['prefered_auth'] SITE_CONFIG['prefered_auth'] @@ -21,7 +19,5 @@ module Tracks auth_schemes.first end end - end - end diff --git a/lib/tracks/source_view.rb b/lib/tracks/source_view.rb index 3e6ae371..beae71c6 100644 --- a/lib/tracks/source_view.rb +++ b/lib/tracks/source_view.rb @@ -1,14 +1,11 @@ # Inspiration from Bruce Williams [http://codefluency.com/articles/2006/07/01/rails-views-getting-in-context/] module Tracks - module SourceViewSwitching - class Responder - def initialize(source_view) @source_view = source_view.underscore.gsub(/\s+/,'_').to_sym rescue nil end - + def nil? yield if @source_view.nil? && block_given? end @@ -16,53 +13,46 @@ module Tracks def context yield if :context == @source_view && block_given? end - - def method_missing(check_source_view,*args) + + def method_missing(check_source_view, *args) yield if check_source_view == @source_view && block_given? end - end - + module Controller - def self.included(base) base.send(:helper, Tracks::SourceViewSwitching::Helper) base.send(:helper_method, :source_view) end - - def source_view_is( s ) + + def source_view_is(s) s == (params[:_source_view] || @source_view).to_sym end - - def source_view_is_one_of( *s ) + + def source_view_is_one_of(*s) s.include?(params[:_source_view].to_sym) end - + def source_view responder = Tracks::SourceViewSwitching::Responder.new(params[:_source_view] || @source_view) block_given? ? yield(responder) : responder end - end - + module Helper - def source_view_tag(name) hidden_field_tag :_source_view, name.underscore.gsub(/\s+/,'_') end - - def source_view_is( s ) + + def source_view_is(s) s == (params[:_source_view] || @source_view).to_sym end - - def source_view_is_one_of( *s ) + + def source_view_is_one_of(*s) s.include?((params[:_source_view] || @source_view).to_sym) end - end - end - end ActionController::Base.send(:include, Tracks::SourceViewSwitching::Controller) From 2d02f2f2620adb0af785caf133aa8e510b8d69c0 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 10 Oct 2020 15:50:59 +0300 Subject: [PATCH 208/767] Update last login field when validating existing login. Show 25 users in the user list instead of just ten. --- app/models/user.rb | 2 +- lib/login_system.rb | 1 + public/dispatch.fcgi | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index e5d27c51..a7fdc43c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,7 +7,7 @@ class User < ApplicationRecord #for will_paginate plugin cattr_accessor :per_page - @@per_page = 10 + @@per_page = 25 has_many(:contexts, -> { order 'position ASC' }, dependent: :delete_all) do def find_by_params(params) diff --git a/lib/login_system.rb b/lib/login_system.rb index cdaaa562..104bbc6c 100644 --- a/lib/login_system.rb +++ b/lib/login_system.rb @@ -152,6 +152,7 @@ module LoginSystem def set_current_user(user) @user = user + User.update(@user.id, last_login_at: Time.zone.now) end # overwrite if you want to have special behavior in case the user is not authorized diff --git a/public/dispatch.fcgi b/public/dispatch.fcgi index 04990df5..6791be74 100755 --- a/public/dispatch.fcgi +++ b/public/dispatch.fcgi @@ -21,4 +21,3 @@ class Rack::PathInfoRewriter end Rack::Handler::FastCGI.run Rack::PathInfoRewriter.new(Tracksapp::Application) - From fd3e1ecd58b272e2f66e465a22e6f65c01ab0ced Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 05:49:56 +0000 Subject: [PATCH 209/767] Bump rubocop from 0.93.0 to 0.93.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.0 to 0.93.1. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.93.0...v0.93.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4f739689..c64d492f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,7 +225,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (1.8.1) + regexp_parser (1.8.2) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -233,7 +233,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.93.0) + rubocop (0.93.1) parallel (~> 1.10) parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) @@ -242,7 +242,7 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.7.1) + rubocop-ast (0.8.0) parser (>= 2.7.1.5) ruby-progressbar (1.10.1) rubyzip (2.3.0) From 0c3a49605eefb8bc22eb58e23ef3b3ce44bf37f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Oct 2020 06:30:23 +0000 Subject: [PATCH 210/767] Bump font-awesome-sass from 5.13.0 to 5.15.1 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.13.0 to 5.15.1. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.13.0...5.15.1) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4a31e12b..ff8d056a 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' # gem 'jbuilder', '~> 1.2' gem 'bootstrap-sass', '3.4.1' -gem 'font-awesome-sass', '~> 5.13.0' +gem 'font-awesome-sass', '~> 5.15.1' group :development do gem 'spring' diff --git a/Gemfile.lock b/Gemfile.lock index c64d492f..682daa4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM factory_bot (~> 6.1.0) railties (>= 5.0.0) ffi (1.13.1) - font-awesome-sass (5.13.0) + font-awesome-sass (5.15.1) sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) @@ -334,7 +334,7 @@ DEPENDENCIES coffee-rails (~> 5.0.0) database_cleaner factory_bot_rails - font-awesome-sass (~> 5.13.0) + font-awesome-sass (~> 5.15.1) htmlentities i18n-tasks (~> 0.9.31) jquery-rails (~> 4.4) From 6b302f7058c252c8e0dcccb6afe2f30b269f83ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Oct 2020 05:44:25 +0000 Subject: [PATCH 211/767] Bump rack-mini-profiler from 2.1.0 to 2.2.0 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.1.0...v2.2.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 682daa4d..9a355cf1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM puma (5.0.2) nio4r (~> 2.0) rack (2.2.3) - rack-mini-profiler (2.1.0) + rack-mini-profiler (2.2.0) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) From c4d7169cb8e5d5f0ea1bd7b8699b9c7e60ddf219 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 23 Oct 2020 00:20:24 +0300 Subject: [PATCH 212/767] Allow changing the ordering of the user list --- app/controllers/users_controller.rb | 10 +++++++--- app/views/users/index.html.erb | 20 ++++++++++---------- config/locales/en.yml | 1 + config/locales/fi.yml | 1 + 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 56ca40d2..8dc5fafc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -7,16 +7,20 @@ class UsersController < ApplicationController # GET /users GET /users.xml def index respond_to do |format| + order_by = 'login' + if params[:order] && User.column_names.include?(params[:order]) + order_by = params[:order] + end format.html do - @page_title = "TRACKS::Manage Users" - @users = User.order('login ASC').paginate :page => params[:page] + @page_title = t('users.manage_users_title') + @users = User.order(order_by + ' ASC').paginate :page => params[:page] @total_users = User.count # When we call users/signup from the admin page we store the URL so that # we get returned here when signup is successful store_location end format.xml do - @users = User.order('login') + @users = User.order(order_by) render :xml => @users.to_xml(:root => :users, :except => [:password]) end end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index f463466f..9056c36b 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -4,24 +4,24 @@ - - - - - + + + + + - - + + <% for user in @users %> id="user-<%= user.id %>"> - - - + + + diff --git a/config/locales/en.yml b/config/locales/en.yml index 4f0a1de9..9b54ee7e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1091,6 +1091,7 @@ en: identity_url: Identity URL label_auth_type: Authentication type manage_users: Manage users + manage_users_title: TRACKS::Manage Users new_password_label: New password new_token_generated: New token successfully generated new_user_heading: 'Sign up a new user:' diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 855f2cf9..bbe96044 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1091,6 +1091,7 @@ fi: identity_url: Identity URL label_auth_type: Authentication type manage_users: Manage users + manage_users_title: TRACKS::Hallitse käyttäjiä new_password_label: New password new_token_generated: New token successfully generated new_user_heading: 'Sign up a new user:' From adb9b249141c91da7fc75c40b32d944236f55bff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 06:43:33 +0000 Subject: [PATCH 213/767] Bump rspec-expectations from 3.9.2 to 3.9.3 Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.2 to 3.9.3. - [Release notes](https://github.com/rspec/rspec-expectations/releases) - [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.2...v3.9.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a355cf1..b9c08ab4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,10 +229,10 @@ GEM reverse_markdown (2.0.0) nokogiri rexml (3.2.4) - rspec-expectations (3.9.2) + rspec-expectations (3.9.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (3.9.4) rubocop (0.93.1) parallel (~> 1.10) parser (>= 2.7.1.5) From 95b2411be5b9bed2d6d0c2da288f8c8fe5e45208 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 06:45:03 +0000 Subject: [PATCH 214/767] Bump simplecov from 0.19.0 to 0.19.1 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.19.0 to 0.19.1. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.0...v0.19.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a355cf1..bd8da751 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,7 +262,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - simplecov (0.19.0) + simplecov (0.19.1) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.3) From e82be31f0f23b4c63870484443f805aab08a141c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2020 06:00:44 +0000 Subject: [PATCH 215/767] Bump puma from 5.0.2 to 5.0.3 Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.3. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.0.2...v5.0.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a355cf1..05843532 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,7 +177,7 @@ GEM parser (2.7.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.0.2) + puma (5.0.3) nio4r (~> 2.0) rack (2.2.3) rack-mini-profiler (2.2.0) From d30138ee10f431d9ecd1193f37095769f2f9163f Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 27 Oct 2020 18:27:41 +0200 Subject: [PATCH 216/767] Fix paginate locale and a few small style issues --- config/locales/en.yml | 20 ++++++++++---------- config/locales/fi.yml | 20 ++++++++++---------- lib/is_taggable.rb | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9b54ee7e..35dfc4dc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1116,17 +1116,17 @@ en: user_created: User created. you_have_to_reset_your_password: You have to reset your password will_paginate: - next_label: След → + next_label: Next → page_entries_info: - multi_page: Отображено %{model} %{from} - %{to} из %{count} - multi_page_html: Отображено %{model} %{from} - %{to} из %{count} + multi_page: Displaying %{model} %{from} - %{to} of %{count} in total + multi_page_html: Displaying %{model} %{from} - %{to} of %{count} in total single_page: - one: Отображен 1 %{model} - other: Отображены все %{count} %{model} - zero: "%{model} не найдено" + one: Displaying 1 %{model} + other: Displaying all %{count} %{model} + zero: No %{model} found single_page_html: - one: Отображен 1 %{model} - other: Отображены все %{count} %{model} - zero: "%{model} не найдено" + one: Displaying 1 %{model} + other: Displaying all %{count} %{model} + zero: No %{model} found page_gap: "…" - previous_label: "← Пред" + previous_label: "← Previous" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index bbe96044..41a5008b 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1116,17 +1116,17 @@ fi: user_created: User created. you_have_to_reset_your_password: You have to reset your password will_paginate: - next_label: След → + next_label: Seuraava → page_entries_info: - multi_page: Отображено %{model} %{from} - %{to} из %{count} - multi_page_html: Отображено %{model} %{from} - %{to} из %{count} + multi_page: Näytetään %{model} %{from} - %{to} yhtensä %{count} tietueesta + multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta single_page: - one: Отображен 1 %{model} - other: Отображены все %{count} %{model} - zero: "%{model} не найдено" + one: Näytetään 1 %{model} + other: Näytetään kaikki %{count} %{model} + zero: "%{model} ei löytynyt" single_page_html: - one: Отображен 1 %{model} - other: Отображены все %{count} %{model} - zero: "%{model} не найдено" + none: Näytetään 1 %{model} + other: Näytetään kaikki %{count} %{model} + zero: "%{model} ei löytynyt" page_gap: "…" - previous_label: "← Пред" + previous_label: "← Edellinen" diff --git a/lib/is_taggable.rb b/lib/is_taggable.rb index 1c96a0c3..47457383 100644 --- a/lib/is_taggable.rb +++ b/lib/is_taggable.rb @@ -38,7 +38,7 @@ module IsTaggable end def has_tag?(tag_name) - return tags.any? {|tag| tag.name == tag_name} + return tags.any? { |tag| tag.name == tag_name } end # Add tags to self. Accepts a string of tagnames, an array of tagnames, or an array of Tags. @@ -62,7 +62,7 @@ module IsTaggable # Removes tags from self. Accepts a string of tagnames, an array of tagnames, or an array of Tags. def _remove_tags(outgoing) outgoing = tag_cast_to_string(outgoing) - tags.destroy(*(self.user.tags.select{|tag| outgoing.include? tag.name})) + tags.destroy(*(self.user.tags.select { |tag| outgoing.include? tag.name })) end def get_tag_name_from_item(item) From 371f8d5adf9aea3d8e3630cc0abff658b6cb6072 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 27 Oct 2020 19:35:01 +0200 Subject: [PATCH 217/767] Coding style fixes --- Gemfile | 71 ++++++++--------------- Gemfile.lock | 6 -- app/controllers/application_controller.rb | 13 +++-- app/controllers/calendar_controller.rb | 12 +--- app/controllers/contexts_controller.rb | 14 ++--- app/controllers/projects_controller.rb | 21 ++++--- app/controllers/todos_controller.rb | 64 +++++++++----------- app/controllers/users_controller.rb | 2 +- app/services/rich_message_extractor.rb | 12 ++-- doc/tracks_template_cli.rb | 63 ++++++++++---------- lib/login_system.rb | 18 +++--- lib/tasks/continuous_integration.rake | 2 +- lib/tasks/tracks.rake | 9 ++- lib/tracks/source_view.rb | 4 +- 14 files changed, 132 insertions(+), 179 deletions(-) diff --git a/Gemfile b/Gemfile index ff8d056a..ffeb3264 100644 --- a/Gemfile +++ b/Gemfile @@ -1,55 +1,41 @@ source 'https://rubygems.org' +gem 'actionpack-xml_parser', '~> 2.0' +gem 'activemodel-serializers-xml', '~> 1.0.1' + +gem 'coffee-rails', '~> 5.0.0' + +gem 'jquery-rails', '~> 4.4' +gem 'jquery-ui-rails', '~>6.0.1' + gem 'rails', '~> 6.0.3' gem 'sassc-rails', '~> 2.1.2' -gem 'coffee-rails', '~> 5.0.0' -#gem 'json' +gem 'bootstrap-sass', '3.4.1' +gem 'font-awesome-sass', '~> 5.15.1' -# todo: remove xml api -gem 'actionpack-xml_parser', '~> 2.0' -gem 'activemodel-serializers-xml', '~> 1.0.1' +gem 'uglifier', '>=1.3.0' + +gem 'aasm', '~> 5.1.1' +gem 'acts_as_list' +gem 'bcrypt', '~> 3.1.16' +gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' +gem 'htmlentities' +gem 'paperclip' +gem 'puma', '~> 5.0' +gem 'rails_autolink' +gem 'RedCloth' +gem 'sanitize', '~> 5.2' +gem 'will_paginate' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer', group: :therubyracer -gem 'uglifier', '>=1.3.0' - -gem 'jquery-rails' , '~> 4.4' -gem 'jquery-ui-rails' , '~>6.0.1' - -# you may comment out the database driver(s) you will not be using. -# This will prevent a native build of the driver. Building native drivers is not -# always possible on all platforms -# Alternatively use --without arguments to bundler to not install that group +# Use --without argument to skip unnecessary drivers gem 'sqlite3', group: :sqlite gem 'mysql2', '~> 0.5.3', group: :mysql gem 'pg', '~> 1.2.3', group: :postgresql -gem 'RedCloth' -gem 'sanitize', '~> 5.2' -gem 'will_paginate' -gem 'acts_as_list' -gem 'aasm', '~> 5.1.1' -gem 'htmlentities' -gem 'rails_autolink' -gem 'puma', '~> 5.0' -gem 'paperclip' - -# To use ActiveModel has_secure_password -gem 'bcrypt', '~> 3.1.16' - -gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' - -# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -# gem 'turbolinks' - -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -# gem 'jbuilder', '~> 1.2' - -gem 'bootstrap-sass', '3.4.1' -gem 'font-awesome-sass', '~> 5.15.1' - group :development do gem 'spring' gem 'yard' @@ -79,15 +65,6 @@ group :test do gem 'mocha', :require => false gem 'minitest-stub-const' - gem 'selenium-webdriver', '~> 3.142' - - # 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' - gem 'simplecov' # get test coverage info on codeclimate gem 'codeclimate-test-reporter', '1.0.7', group: :test, require: nil diff --git a/Gemfile.lock b/Gemfile.lock index c89ec2e5..ee96c7e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,6 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) - childprocess (3.0.0) climate_control (0.2.0) codeclimate-test-reporter (1.0.7) simplecov @@ -245,7 +244,6 @@ GEM rubocop-ast (0.8.0) parser (>= 2.7.1.5) ruby-progressbar (1.10.1) - rubyzip (2.3.0) safe_yaml (1.0.5) sanitize (5.2.1) crass (~> 1.0.2) @@ -259,9 +257,6 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) simplecov (0.19.1) docile (~> 1.1) simplecov-html (~> 0.11) @@ -355,7 +350,6 @@ DEPENDENCIES rubocop (~> 0.93) sanitize (~> 5.2) sassc-rails (~> 2.1.2) - selenium-webdriver (~> 3.142) simplecov solargraph spring diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e33d8d3e..1812b9ac 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -24,8 +24,8 @@ class ApplicationController < ActionController::Base def set_locale locale = params[:locale] # specifying a locale in the request takes precedence - locale = locale || prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over - locale = locale || request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE'] + locale ||= prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over + locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE'] if locale && I18n::available_locales.map(&:to_s).include?(locale.to_s) I18n.locale = locale @@ -43,13 +43,14 @@ class ApplicationController < ActionController::Base # Get expiry time (allow ten seconds window for the case where we have # none) - expiry_time = session['expiry_time'] || Time.now + 10 - if expiry_time < Time.now + now = Time.zone.now + expiry_time = session['expiry_time'] || now + 10 + if expiry_time < now # Too late, matey... bang goes your session! reset_session else # Okay, you get another hour - session['expiry_time'] = Time.now + (60*60) + session['expiry_time'] = now + (60*60) end end @@ -109,7 +110,7 @@ class ApplicationController < ActionController::Base end def format_dependencies_as_json_for_auto_complete(entries) - json_elems = Array[*entries.map{ |e| { :value => e.id.to_s, :label => e.specification } }].to_json + json_elems = Array[*entries.map { |e| { :value => e.id.to_s, :label => e.specification } }].to_json return json_elems end diff --git a/app/controllers/calendar_controller.rb b/app/controllers/calendar_controller.rb index 7058104b..87f37ea5 100644 --- a/app/controllers/calendar_controller.rb +++ b/app/controllers/calendar_controller.rb @@ -13,15 +13,9 @@ class CalendarController < ApplicationController respond_to do |format| format.html - format.m { - cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } - } - format.ics { - render :action => 'show', :layout => false, :content_type => Mime[:ics] - } - format.xml { - render :xml => @due_all.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) - } + format.m { cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } } + format.ics { render :action => 'show', :layout => false, :content_type => Mime[:ics] } + format.xml { render :xml => @due_all.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } end end end diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb index fe660ce6..3121ac56 100644 --- a/app/controllers/contexts_controller.rb +++ b/app/controllers/contexts_controller.rb @@ -40,7 +40,7 @@ class ContextsController < ApplicationController @max_completed = current_user.prefs.show_number_completed @done = @context.todos.completed.limit(@max_completed).reorder(Arel.sql("todos.completed_at DESC, todos.created_at DESC")).includes(Todo::DEFAULT_INCLUDES) @not_done_todos = @context.todos.active_or_hidden.not_project_hidden.reorder(Arel.sql('todos.due IS NULL, todos.due ASC, todos.created_at ASC')).includes(Todo::DEFAULT_INCLUDES) - @todos_without_project = @not_done_todos.select{ |t| t.project.nil? } + @todos_without_project = @not_done_todos.select { |t| t.project.nil? } @deferred_todos = @context.todos.deferred.includes(Todo::DEFAULT_INCLUDES) @pending_todos = @context.todos.pending.includes(Todo::DEFAULT_INCLUDES) @@ -110,13 +110,13 @@ class ContextsController < ApplicationController respond_to do |format| format.js - format.xml { + format.xml do if @saved render :xml => @context.to_xml(:except => :user_id) else render :body => "Error on update: #{@context.errors.full_messages.inject("") { |v, e| v + e + " " }}", :status => 409 end - } + end end end @@ -202,17 +202,17 @@ class ContextsController < ApplicationController @active_contexts = current_user.contexts.active @hidden_contexts = current_user.contexts.hidden @down_count = @active_contexts.size + @hidden_contexts.size - cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } + cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } render end end def render_context_mobile lambda do - @page_title = "TRACKS::List actions in "+@context.name - @not_done = @not_done_todos.select {|t| t.context_id == @context.id } + @page_title = "TRACKS::List actions in " + @context.name + @not_done = @not_done_todos.select { |t| t.context_id == @context.id } @down_count = @not_done.size - cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } + cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } @mobile_from_context = @context.id render end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c572575c..2c95b993 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -34,7 +34,7 @@ class ProjectsController < ApplicationController format.m do @completed_projects = current_user.projects.completed @down_count = @active_projects.size + @hidden_projects.size + @completed_projects.size - cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']} + cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } end format.xml { render :xml => @projects.to_xml(:root => :projects, :except => :user_id) } format.any(:rss, :atom) do @@ -43,7 +43,7 @@ class ProjectsController < ApplicationController end format.text do # somehow passing Mime[:text] using content_type to render does not work - headers['Content-Type']=Mime[:text].to_s + headers['Content-Type'] = Mime[:text].to_s end format.autocomplete do projects = current_user.projects.active + current_user.projects.hidden @@ -60,7 +60,7 @@ class ProjectsController < ApplicationController @projects_to_review = projects.select { |p| p.needs_review?(current_user) } @stalled_projects = projects.select { |p| p.stalled? } @blocked_projects = projects.select { |p| p.blocked? } - @current_projects = projects.uncompleted.select { |p| not (p.needs_review?(current_user)) }.sort_by { |p| p.last_reviewed || Time.zone.at(0) } + @current_projects = projects.uncompleted.select { |p| not p.needs_review?(current_user) }.sort_by { |p| p.last_reviewed || Time.zone.at(0) } init_not_done_counts(['project']) init_hidden_todo_counts(['project']) @@ -112,11 +112,11 @@ class ProjectsController < ApplicationController def projects_and_actions @projects = current_user.projects.active respond_to do |format| - format.text { + format.text do # somehow passing Mime[:text] using content_type to render does not work headers['Content-Type'] = Mime[:text].to_s render :action => 'index_text_projects_and_actions', :layout => false, :content_type => Mime[:text] - } + end end end @@ -246,15 +246,14 @@ class ProjectsController < ApplicationController respond_to do |format| format.js { render :template => template } format.html { redirect_to :action => 'index'} - format.xml { + format.xml do if @saved - render :xml => @project.to_xml( :except => :user_id ) + render :xml => @project.to_xml(:except => :user_id) else render :body => "Error on update: #{@project.errors.full_messages.inject("") { |v, e| v + e + " " }}", :status => 409 end - } + end end - end def edit @@ -268,10 +267,10 @@ class ProjectsController < ApplicationController @project.destroy respond_to do |format| - format.js { + format.js do @down_count = current_user.projects.size update_state_counts - } + end format.xml { render :body => "Deleted project #{@project.name}" } end end diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 4734d85c..863086a0 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -703,7 +703,7 @@ class TodosController < ApplicationController def tags tags_beginning = current_user.tags.where(Tag.arel_table[:name].matches("#{params[:term]}%")) tags_all = current_user.tags.where(Tag.arel_table[:name].matches("%#{params[:term]}%")) - tags_all = tags_all - tags_beginning + tags_all -= tags_beginning respond_to do |format| format.autocomplete { render :body => for_autocomplete(tags_beginning+tags_all, params[:term]) } @@ -731,30 +731,26 @@ class TodosController < ApplicationController determine_down_count determine_remaining_in_container_count(@todo) source_view do |page| - page.project { + page.project do @remaining_undone_in_project = current_user.projects.find(@todo.project_id).todos.not_completed.count - } - page.tag { - determine_deferred_tag_count(params['_tag_name']) - } + end + page.tag { determine_deferred_tag_count(params['_tag_name']) } end respond_to do |format| format.html { redirect_to :back } format.js { render :action => 'update' } - format.m { + format.m do notify(:notice, t("todos.action_deferred", :description => @todo.description)) do_mobile_todo_redirection - } + end end end def list_hidden @hidden = current_user.todos.hidden respond_to do |format| - format.xml { - render :xml => @hidden.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) - } + format.xml { render :xml => @hidden.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } end end @@ -801,12 +797,8 @@ class TodosController < ApplicationController @todo = current_user.todos.find(params['id']) @return_path = cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path respond_to do |format| - format.html { - redirect_to home_path, "Viewing note of todo is not implemented" - } - format.m { - render :action => "show_notes" - } + format.html { redirect_to home_path, "Viewing note of todo is not implemented" } + format.m { render :action => "show_notes" } end end @@ -866,9 +858,9 @@ class TodosController < ApplicationController # Additional tag condition(s) handled as AND. @tag_expr << params[:and].split(',') if params[:and] i = 1 - while params['and'+i.to_s] - @tag_expr << params['and'+i.to_s].split(',') - i=i+1 + while params['and' + i.to_s] + @tag_expr << params['and' + i.to_s].split(',') + i += 1 end @single_tag = @tag_expr.size == 1 && @tag_expr[0].size == 1 @@ -986,17 +978,17 @@ end def determine_remaining_in_container_count(todo = @todo) source_view do |from| - from.deferred { + from.deferred do todos_in_container, todos_in_target_container = find_todos_in_container_and_target_container(todo, @todo) @remaining_in_context = todos_in_container.deferred_or_blocked.count @target_context_count = todos_in_target_container.deferred_or_blocked.count - } - from.todo { + end + from.todo do todos_in_container, todos_in_target_container = find_todos_in_container_and_target_container(todo, @todo) @remaining_in_context = todos_in_container.active.not_hidden.count @target_context_count = todos_in_target_container.active.not_hidden.count - } - from.tag { + end + from.tag do tag = Tag.where(:name => params['_tag_name']).first tag = Tag.new(:name => params['tag']) if tag.nil? @@ -1006,8 +998,8 @@ end @target_context_count = todos_in_target_container.active.not_hidden.with_tag(tag.id).count @remaining_hidden_count = current_user.todos.hidden.with_tag(tag.id).count @remaining_deferred_or_pending_count = current_user.todos.with_tag(tag.id).deferred_or_blocked.count - } - from.project { + end + from.project do project_id = @project_changed ? @original_item.project_id : @todo.project_id @remaining_deferred_or_pending_count = current_user.projects.find(project_id).todos.deferred_or_blocked.count @@ -1018,11 +1010,11 @@ end end @target_context_count = current_user.projects.find(project_id).todos.active.count - } - from.calendar { + end + from.calendar do @target_context_count = @new_due_id.blank? ? 0 : count_old_due_empty(@new_due_id) - } - from.context { + end + from.context do context = current_user.contexts.find(todo.context_id) @remaining_deferred_or_pending_count = context.todos.deferred_or_blocked.count @@ -1037,13 +1029,11 @@ end actions_in_target = @todo.context.todos.deferred_or_blocked end @target_context_count = actions_in_target.count - } - from.done { + end + from.done do @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 + from.all_done { @remaining_in_context = current_user.todos.completed.count } end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8dc5fafc..54aa94f2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -97,7 +97,7 @@ class UsersController < ApplicationController user.is_admin = true if first_user_signing_up if user.save @user = User.authenticate(user.login, params['user']['password']) - @user.create_preference({:locale => I18n.locale}) + @user.create_preference({ :locale => I18n.locale }) @user.save session['user_id'] = @user.id unless signup_by_admin notify :notice, t('users.signup_successful', :username => @user.login) diff --git a/app/services/rich_message_extractor.rb b/app/services/rich_message_extractor.rb index 435d0520..2e67a94e 100644 --- a/app/services/rich_message_extractor.rb +++ b/app/services/rich_message_extractor.rb @@ -3,12 +3,12 @@ class RichMessageExtractor include ActionView::Helpers::SanitizeHelper extend ActionView::Helpers::SanitizeHelper::ClassMethods - PROJECT_MARKER = '~' - CONTEXT_MARKER = '@' - TICKLER_MARKER = '>' - DUE_MARKER = '<' - TAG_MARKER = '#' - STAR_MARKER = '*' + PROJECT_MARKER = '~'.freeze + CONTEXT_MARKER = '@'.freeze + TICKLER_MARKER = '>'.freeze + DUE_MARKER = '<'.freeze + TAG_MARKER = '#'.freeze + STAR_MARKER = '*'.freeze ALL_MARKERS = [ PROJECT_MARKER, diff --git a/doc/tracks_template_cli.rb b/doc/tracks_template_cli.rb index 92d63b3e..5ecf9f94 100644 --- a/doc/tracks_template_cli.rb +++ b/doc/tracks_template_cli.rb @@ -33,12 +33,12 @@ # Simple test file. Remove the '# ' string at the beginning. # token [A] # token [BB] -# +# # to [A] after [BB] # .task 1 in [A], [BB]|computer|starred,blue|my notes here # ^task 1.1 dependent on [A]|||only a note # .task 2 -# +# # project 2 with [A] # .task in project 2 @@ -73,18 +73,17 @@ require 'readline' require File.expand_path(File.dirname(__FILE__) + '/tracks_cli/tracks_api') class TemplateParser - def initialize @keywords = {} end def parse_keyword(token) - print "Input required for "+token+": " - @keywords[token]=gets.chomp + print "Input required for " + token + ": " + @keywords[token] = gets.chomp end def replace_tokens_in(line) - @keywords.each{ |key,val| line=line.sub(key,val) } + @keywords.each { |key, val| line = line.sub(key, val) } line end @@ -92,27 +91,27 @@ class TemplateParser options = {} # first char is . or ^ the latter meaning this todo is dependent on the previous one - options[:depend]= line[0].chr == "^" ? true : false; + options[:depend] = line[0].chr == "^" line = line[1..line.length] # remove first char - tmp= line.split("|") + tmp = line.split("|") if tmp.length > 5 puts "Formatting error: found too many |" exit 1 end tmp[0].chomp! - options[:description]=tmp[0] + options[:description] = tmp[0] - tmp.each_with_index do |t,idx| - t=t.strip.chomp - t=nil if t.empty? - tmp[idx]=t + tmp.each_with_index do |t, idx| + t = t.strip.chomp + t = nil if t.empty? + tmp[idx] = t end - options[:context]=tmp[1] - options[:taglist]=tmp[2] - options[:notes] =tmp[3] + options[:context] = tmp[1] + options[:taglist] = tmp[2] + options[:notes] = tmp[3] options end @@ -124,8 +123,8 @@ class TemplateParser next if (line.empty? || line[0].chr == "#") # check if line defines a token - if (line.split(' ')[0] == "token") - parse_keyword line.split(' ')[1] + if (line.split(' ')[0] == "token") + parse_keyword line.split(' ')[1] next end @@ -136,18 +135,16 @@ class TemplateParser if (line[0].chr == "." ) || (line[0].chr == "^") if @last_project_id.nil? puts "Warning: no project specified for task \"#{line}\". Using default project." - end + end poster.postTodo(parse_todo(line), @last_project_id) else @last_project_id = poster.postProject(line) end end end - end class TemplatePoster - def initialize(options) @options = options @tracks = TracksCli::TracksAPI.new({ @@ -163,10 +160,10 @@ class TemplatePoster def postTodo(parsed_todo, project_id) resp = @tracks.post_todo( - description: CGI.escapeHTML(parsed_todo[:description]), - context_name: parsed_todo[:context], - context_id: @context_id, - project_id: project_id || @project_id, + description: CGI.escapeHTML(parsed_todo[:description]), + context_name: parsed_todo[:context], + context_id: @context_id, + project_id: project_id || @project_id, show_from: parsed_todo[:show_from], notes: parsed_todo[:notes], is_dependend: parsed_todo[:depend], @@ -174,7 +171,7 @@ class TemplatePoster if resp.code == '302' || resp.code == '201' puts resp['location'] if @options[:verbose] - + # return the todo id @last_posted_todo_id = resp['location'].split("/").last return @last_posted_todo_id @@ -209,11 +206,13 @@ class TemplatePoster return resp.code == '200' end - end -class Error < StandardError; end -class InvalidParser < StandardError; end +class Error < StandardError +end + +class InvalidParser < StandardError +end class ConsoleOptionsForTemplate attr_reader :parser, :options, :keywords @@ -275,14 +274,14 @@ class ConsoleOptionsForTemplate puts "ERROR: no GTD_LOGIN environment variable set" exit 1 end - + if ENV['GTD_PASSWORD'] == nil puts "ERROR: no GTD_PASSWORD environment variable set" exit 1 end - + file = @filename.nil? ? STDIN : File.open(@filename) - + ## check for existence of the context if @options[:context_id].nil? puts "ERROR: need to specify a context_id with -c option." diff --git a/lib/login_system.rb b/lib/login_system.rb index 104bbc6c..37aa91e0 100644 --- a/lib/login_system.rb +++ b/lib/login_system.rb @@ -12,11 +12,11 @@ module LoginSystem # Logout the {#current_user} and redirect to login page # # @param [String] message notification to display - def logout_user message=t('login.logged_out') + def logout_user(message=t('login.logged_out')) @user.forget_me if logged_in? cookies.delete :auth_token session['user_id'] = nil - if ( SITE_CONFIG['authentication_schemes'].include? 'cas') && session[:cas_user] + if SITE_CONFIG['authentication_schemes'].include?('cas') && session[:cas_user] CASClient::Frameworks::Rails::Filter.logout(self) else reset_session @@ -36,7 +36,7 @@ module LoginSystem # user.login != "bob" # end def authorize?(user) - true + true end # overwrite this method if you only want to protect certain actions of the controller @@ -78,7 +78,7 @@ module LoginSystem end # Allow also login based on auth data auth = get_basic_auth_data - if user = User.where(:login => auth[:user], :token => auth[:pass]).first + if (user = User.where(:login => auth[:user], :token => auth[:pass]).first) set_current_user(user) return true end @@ -102,12 +102,12 @@ module LoginSystem login_from_cookie - if session['user_id'] and authorize?(get_current_user) + if session['user_id'] && authorize?(get_current_user) return true end auth = get_basic_auth_data - if user = User.authenticate(auth[:user], auth[:pass]) + if (user = User.authenticate(auth[:user], auth[:pass])) session['user_id'] = user.id set_current_user(user) return true @@ -125,12 +125,12 @@ module LoginSystem def login_optional login_from_cookie - if session['user_id'] and authorize?(get_current_user) + if session['user_id'] && authorize?(get_current_user) return true end auth = get_basic_auth_data - if user = User.authenticate(auth[:user], auth[:pass]) + if (user = User.authenticate(auth[:user], auth[:pass])) session['user_id'] = user.id set_current_user(user) return true @@ -197,7 +197,7 @@ module LoginSystem authdata = request.env[location].to_s.split end end - if authdata and authdata[0] == 'Basic' + if authdata && authdata[0] == 'Basic' data = Base64.decode64(authdata[1]).split(':')[0..1] { user: data[0], diff --git a/lib/tasks/continuous_integration.rake b/lib/tasks/continuous_integration.rake index b3d6536a..324d4672 100644 --- a/lib/tasks/continuous_integration.rake +++ b/lib/tasks/continuous_integration.rake @@ -1,7 +1,7 @@ namespace :ci do desc 'Continuous integration tests, without features' task :lite do - ENV['RAILS_ENV'] ||= "test" + ENV['RAILS_ENV'] ||= "test" puts 'Running "lite" test suite' diff --git a/lib/tasks/tracks.rake b/lib/tasks/tracks.rake index 8370cde6..0089f43b 100644 --- a/lib/tasks/tracks.rake +++ b/lib/tasks/tracks.rake @@ -2,20 +2,20 @@ namespace :tracks do desc 'Replace the password of USER with a new one.' task :password => :environment do require "io/console" - + 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 - + end + puts "Changing Tracks password for #{ENV['USER']}." print "New password: " password = STDIN.noecho(&:gets).chomp print "\nRetype new password: " password_confirmation = STDIN.noecho(&:gets).chomp puts - + begin user.change_password(password, password_confirmation) puts "Password changed." @@ -25,4 +25,3 @@ namespace :tracks do end end end - diff --git a/lib/tracks/source_view.rb b/lib/tracks/source_view.rb index beae71c6..de4e8030 100644 --- a/lib/tracks/source_view.rb +++ b/lib/tracks/source_view.rb @@ -3,7 +3,7 @@ module Tracks module SourceViewSwitching class Responder def initialize(source_view) - @source_view = source_view.underscore.gsub(/\s+/,'_').to_sym rescue nil + @source_view = source_view.underscore.gsub(/\s+/, '_').to_sym rescue nil end def nil? @@ -41,7 +41,7 @@ module Tracks module Helper def source_view_tag(name) - hidden_field_tag :_source_view, name.underscore.gsub(/\s+/,'_') + hidden_field_tag :_source_view, name.underscore.gsub(/\s+/, '_') end def source_view_is(s) From eb57c2047f755b7c48fdc541e1b8eeb103bfd731 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Oct 2020 06:02:03 +0000 Subject: [PATCH 218/767] Bump puma from 5.0.3 to 5.0.4 Bumps [puma](https://github.com/puma/puma) from 5.0.3 to 5.0.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.0.3...v5.0.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ee96c7e4..19589e9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM parser (2.7.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.0.3) + puma (5.0.4) nio4r (~> 2.0) rack (2.2.3) rack-mini-profiler (2.2.0) From 8095384921a93efa235bcf738bce310968116874 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Oct 2020 05:53:28 +0000 Subject: [PATCH 219/767] Bump rspec-expectations from 3.9.3 to 3.9.4 Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.3 to 3.9.4. - [Release notes](https://github.com/rspec/rspec-expectations/releases) - [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.3...v3.9.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ee96c7e4..a19f3efd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,7 +228,7 @@ GEM reverse_markdown (2.0.0) nokogiri rexml (3.2.4) - rspec-expectations (3.9.3) + rspec-expectations (3.9.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) From 317ca43eea951360934ee2e1cd1d79c451a2a90f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2020 06:25:16 +0000 Subject: [PATCH 220/767] Bump rspec-expectations from 3.9.4 to 3.10.0 Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.4 to 3.10.0. - [Release notes](https://github.com/rspec/rspec-expectations/releases) - [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.4...v3.10.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7627b0da..9278ed1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,10 +228,10 @@ GEM reverse_markdown (2.0.0) nokogiri rexml (3.2.4) - rspec-expectations (3.9.4) + rspec-expectations (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.4) + rspec-support (~> 3.10.0) + rspec-support (3.10.0) rubocop (0.93.1) parallel (~> 1.10) parser (>= 2.7.1.5) From e4e17f347a3069e745401f37b2d4b815ef115fd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2020 05:52:04 +0000 Subject: [PATCH 221/767] Bump tolk from 4.0.0 to 4.0.1 Bumps [tolk](https://github.com/tolk/tolk) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/tolk/tolk/releases) - [Changelog](https://github.com/tolk/tolk/blob/master/CHANGELOG.md) - [Commits](https://github.com/tolk/tolk/compare/v4.0.0...v4.0.1) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index ffeb3264..b1059aed 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ group :development do gem 'spring' gem 'yard' - gem 'tolk', '~> 4.0.0' + gem 'tolk', '~> 4.0.1' gem 'bullet' gem 'rack-mini-profiler' diff --git a/Gemfile.lock b/Gemfile.lock index 7627b0da..9df6486b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -294,7 +294,7 @@ GEM thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - tolk (4.0.0) + tolk (4.0.1) rails (>= 5.0) safe_yaml (>= 0.8.6) sassc @@ -309,7 +309,7 @@ GEM websocket-extensions (0.1.5) will_paginate (3.3.0) yard (0.9.25) - zeitwerk (2.4.0) + zeitwerk (2.4.1) PLATFORMS ruby @@ -355,7 +355,7 @@ DEPENDENCIES spring sqlite3 therubyracer - tolk (~> 4.0.0) + tolk (~> 4.0.1) uglifier (>= 1.3.0) will_paginate yard From 265be1a28345c903129694a885f2b0fe512956bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2020 05:56:16 +0000 Subject: [PATCH 222/767] Bump listen from 3.2.1 to 3.3.0 Bumps [listen](https://github.com/guard/listen) from 3.2.1 to 3.3.0. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.2.1...v3.3.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 77272b1c..e90355f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) libv8 (3.16.14.19) - listen (3.2.1) + listen (3.3.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.7.0) From d034e678d481c3604b6f57751a2bf8a751f10f15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2020 06:33:15 +0000 Subject: [PATCH 223/767] Bump listen from 3.3.0 to 3.3.1 Bumps [listen](https://github.com/guard/listen) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.3.0...v3.3.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e90355f2..61fff50e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) libv8 (3.16.14.19) - listen (3.3.0) + listen (3.3.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.7.0) From dbf33cb79911d129d582f68d6ac9da6abbb34ed9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 06:31:44 +0000 Subject: [PATCH 224/767] Bump simplecov from 0.19.1 to 0.20.0 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.19.1 to 0.20.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.1...v0.20.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 61fff50e..f9324efb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -257,10 +257,12 @@ GEM sprockets (> 3.0) sprockets-rails tilt - simplecov (0.19.1) + simplecov (0.20.0) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.2) solargraph (0.39.17) backport (~> 1.1) benchmark From 0bd02da39a211244598d18248c6a81c51cc8455b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 06:34:53 +0000 Subject: [PATCH 225/767] Bump listen from 3.3.1 to 3.3.3 Bumps [listen](https://github.com/guard/listen) from 3.3.1 to 3.3.3. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 61fff50e..63a8c30d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) libv8 (3.16.14.19) - listen (3.3.1) + listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.7.0) From da083d7b6cf93db7c01ca0a2a813d054e59bd24d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 06:05:42 +0000 Subject: [PATCH 226/767] Bump puma from 5.0.4 to 5.1.0 Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.1.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.0.4...v5.1.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b1059aed..c1270b2c 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'bcrypt', '~> 3.1.16' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' gem 'htmlentities' gem 'paperclip' -gem 'puma', '~> 5.0' +gem 'puma', '~> 5.1' gem 'rails_autolink' gem 'RedCloth' gem 'sanitize', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 61fff50e..cc374a69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM parser (2.7.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.0.4) + puma (5.1.0) nio4r (~> 2.0) rack (2.2.3) rack-mini-profiler (2.2.0) @@ -340,7 +340,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 5.0) + puma (~> 5.1) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing From 03ab384b9c16c2678a31cd1005ee8ed08b355639 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 11 Dec 2020 17:55:54 +0200 Subject: [PATCH 227/767] Fix the tag-specific listing to fetch the user's specific tag instead of the first one in a multi-user environment. --- app/controllers/todos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 863086a0..57090b8f 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -907,7 +907,7 @@ end def find_todos_with_tag_expr(tag_expr) # optimize for the common case: selecting only one tag if @single_tag - tag = Tag.where(:name => @tag_name).first + tag = current_user.tags.where(:name => @tag_name).first tag_id = tag.nil? ? -1 : tag.id return current_user.todos.with_tag(tag_id) end From f9bae12c31c6c1b11094bd78fe1b6981d34edfb6 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 11 Dec 2020 18:21:05 +0200 Subject: [PATCH 228/767] Upgrade libraries --- Gemfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b43051bb..ed10b406 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM acts_as_list (1.0.2) activerecord (>= 4.2) ast (2.4.1) - autoprefixer-rails (10.0.1.0) + autoprefixer-rails (10.1.0.0) execjs backport (1.1.2) bcrypt (3.1.16) @@ -105,7 +105,7 @@ GEM diff-lcs (1.4.4) docile (1.3.2) e2mmap (0.1.0) - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) factory_bot (6.1.0) activesupport (>= 5.0.0) @@ -142,7 +142,7 @@ GEM listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -153,7 +153,7 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.4.0) @@ -164,7 +164,7 @@ GEM nio4r (2.5.4) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) paperclip (6.1.0) activemodel (>= 4.2.0) @@ -172,11 +172,11 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - parallel (1.19.2) + parallel (1.20.1) parser (2.7.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.1.0) + puma (5.1.1) nio4r (~> 2.0) rack (2.2.3) rack-mini-profiler (2.2.0) @@ -224,7 +224,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (1.8.2) + regexp_parser (2.0.0) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -241,7 +241,7 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.8.0) + rubocop-ast (1.3.0) parser (>= 2.7.1.5) ruby-progressbar (1.10.1) safe_yaml (1.0.5) @@ -286,7 +286,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - terminal-table (1.8.0) + terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) @@ -300,7 +300,7 @@ GEM rails (>= 5.0) safe_yaml (>= 0.8.6) sassc - tzinfo (1.2.7) + tzinfo (1.2.8) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -311,7 +311,7 @@ GEM websocket-extensions (0.1.5) will_paginate (3.3.0) yard (0.9.25) - zeitwerk (2.4.1) + zeitwerk (2.4.2) PLATFORMS ruby From 0b2eec4f82b8c99f0501ed7f68c68fef0b57aaf4 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Fri, 11 Dec 2020 18:39:30 +0200 Subject: [PATCH 229/767] Move to Ruby 2.7 for the default Docker version as well as the default target for alternative DB's. Fix the Ruby image version with three digits because the most recent versions seem to be somehow broken. --- .github/workflows/continuous-integration.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile-2.5 | 10 +++++----- Dockerfile-2.7 => Dockerfile-2.6 | 10 +++++----- test-envs/docker-compose-2.6-mysql.yml | 2 +- test-envs/docker-compose-2.7-mysql.yml | 2 +- ....6-postgres.yml => docker-compose-2.7-postgres.yml} | 0 ...se-2.6-sqlite.yml => docker-compose-2.7-sqlite.yml} | 0 8 files changed, 17 insertions(+), 17 deletions(-) rename Dockerfile-2.7 => Dockerfile-2.6 (97%) rename test-envs/{docker-compose-2.6-postgres.yml => docker-compose-2.7-postgres.yml} (100%) rename test-envs/{docker-compose-2.6-sqlite.yml => docker-compose-2.7-sqlite.yml} (100%) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 73143937..4ceda594 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,17 +22,17 @@ jobs: - uses: actions/checkout@v1 - run: bash -x script/cibuild 2.7 mysql - test26postgres: + test27postgres: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: bash -x script/cibuild 2.6 postgres + - run: bash -x script/cibuild 2.7 postgres - test26sqlite: + test27sqlite: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: bash -x script/cibuild 2.6 sqlite + - run: bash -x script/cibuild 2.7 sqlite # - run: bash -x script/cibuild 2.5 postgres # - run: bash -x script/cibuild 2.7 postgres diff --git a/Dockerfile b/Dockerfile index bf82d720..303b86b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6 +FROM ruby:2.7.1 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 diff --git a/Dockerfile-2.5 b/Dockerfile-2.5 index a3fb50a1..f453241e 100644 --- a/Dockerfile-2.5 +++ b/Dockerfile-2.5 @@ -1,4 +1,4 @@ -FROM ruby:2.5 +FROM ruby:2.5.7 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 @@ -7,14 +7,14 @@ WORKDIR /app RUN touch /etc/app-env -COPY Gemfile* /app/ -RUN gem install bundler -RUN bundle install --jobs 4 - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list RUN apt-get update && apt-get install -y yarn +COPY Gemfile* /app/ +RUN gem install bundler +RUN bundle install --jobs 4 + RUN mkdir /app/log COPY . /app/ diff --git a/Dockerfile-2.7 b/Dockerfile-2.6 similarity index 97% rename from Dockerfile-2.7 rename to Dockerfile-2.6 index a68b373d..0bef7e0e 100644 --- a/Dockerfile-2.7 +++ b/Dockerfile-2.6 @@ -1,4 +1,4 @@ -FROM ruby:2.7 +FROM ruby:2.6.5 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 @@ -7,14 +7,14 @@ WORKDIR /app RUN touch /etc/app-env -COPY Gemfile* /app/ -RUN gem install bundler -RUN bundle install --jobs 4 - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list RUN apt-get update && apt-get install -y yarn +COPY Gemfile* /app/ +RUN gem install bundler +RUN bundle install --jobs 4 + RUN mkdir /app/log COPY . /app/ diff --git a/test-envs/docker-compose-2.6-mysql.yml b/test-envs/docker-compose-2.6-mysql.yml index 67e67f17..8af77f50 100644 --- a/test-envs/docker-compose-2.6-mysql.yml +++ b/test-envs/docker-compose-2.6-mysql.yml @@ -10,7 +10,7 @@ services: web: build: context: .. - dockerfile: Dockerfile + dockerfile: Dockerfile-2.6 environment: # These are set in script/ci-build, so we need to pass-thru them. RAILS_ENV: $RAILS_ENV diff --git a/test-envs/docker-compose-2.7-mysql.yml b/test-envs/docker-compose-2.7-mysql.yml index 58e433ff..67e67f17 100644 --- a/test-envs/docker-compose-2.7-mysql.yml +++ b/test-envs/docker-compose-2.7-mysql.yml @@ -10,7 +10,7 @@ services: web: build: context: .. - dockerfile: Dockerfile-2.7 + dockerfile: Dockerfile environment: # These are set in script/ci-build, so we need to pass-thru them. RAILS_ENV: $RAILS_ENV diff --git a/test-envs/docker-compose-2.6-postgres.yml b/test-envs/docker-compose-2.7-postgres.yml similarity index 100% rename from test-envs/docker-compose-2.6-postgres.yml rename to test-envs/docker-compose-2.7-postgres.yml diff --git a/test-envs/docker-compose-2.6-sqlite.yml b/test-envs/docker-compose-2.7-sqlite.yml similarity index 100% rename from test-envs/docker-compose-2.6-sqlite.yml rename to test-envs/docker-compose-2.7-sqlite.yml From 680fc3df8b18cab12b64c1bc4f66278b8c035c79 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 27 Dec 2020 17:15:15 +0200 Subject: [PATCH 230/767] #2534: Fix setting the due date in the calendar view. Reverts abad8c7 partly. --- app/controllers/todos_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 863086a0..54818b77 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -1121,18 +1121,19 @@ end end def count_old_due_empty(id) + due_today_date = Time.zone.now + due_this_week_date = Time.zone.now.end_of_week + due_next_week_date = due_this_week_date + 7.days + due_this_month_date = Time.zone.now.end_of_month + case id when "due_today" - due_today_date = Time.zone.now return current_user.todos.not_completed.where('todos.due <= ?', due_today_date).count when "due_this_week" - due_this_week_date = Time.zone.now.end_of_week return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_today_date, due_this_week_date).count when "due_next_week" - due_next_week_date = due_this_week_date + 7.days return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_this_week_date, due_next_week_date).count when "due_this_month" - due_this_month_date = Time.zone.now.end_of_month return current_user.todos.not_completed.where('todos.due > ? AND todos.due <= ?', due_next_week_date, due_this_month_date).count when "due_after_this_month" return current_user.todos.not_completed.where('todos.due > ?', due_this_month_date).count From 921efb3aadad556fa68a5b9efd1f7d189dc34a4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 16:16:30 +0000 Subject: [PATCH 231/767] Bump i18n-tasks from 0.9.31 to 0.9.33 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.31 to 0.9.33. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.31...v0.9.33) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index c1270b2c..d835cc44 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ group :development do gem 'rack-mini-profiler' gem 'solargraph' - gem 'i18n-tasks', '~> 0.9.31' + gem 'i18n-tasks', '~> 0.9.33' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index ed10b406..dbcb75ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,7 @@ GEM htmlentities (4.3.4) i18n (1.8.5) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.31) + i18n-tasks (0.9.33) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -219,7 +219,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -300,7 +300,7 @@ GEM rails (>= 5.0) safe_yaml (>= 0.8.6) sassc - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -333,7 +333,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.15.1) htmlentities - i18n-tasks (~> 0.9.31) + i18n-tasks (~> 0.9.33) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen From 979bc35ce91be8e9d762d648e3598d74957ac283 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 16:22:29 +0000 Subject: [PATCH 232/767] Bump bullet from 6.1.0 to 6.1.2 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.0 to 6.1.2. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.0...6.1.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed10b406..d4414dfa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - bullet (6.1.0) + bullet (6.1.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -300,7 +300,7 @@ GEM rails (>= 5.0) safe_yaml (>= 0.8.6) sassc - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) From 6578cc1b2ebf8747d74c3e14455525bccb0f2283 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 16:36:16 +0000 Subject: [PATCH 233/767] Bump rspec-expectations from 3.10.0 to 3.10.1 Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/rspec/rspec-expectations/releases) - [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-expectations/compare/v3.10.0...v3.10.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed10b406..12feba7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,7 @@ GEM htmlentities (4.3.4) i18n (1.8.5) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.31) + i18n-tasks (0.9.33) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -219,7 +219,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -228,10 +228,10 @@ GEM reverse_markdown (2.0.0) nokogiri rexml (3.2.4) - rspec-expectations (3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-support (3.10.0) + rspec-support (3.10.1) rubocop (0.93.1) parallel (~> 1.10) parser (>= 2.7.1.5) @@ -300,7 +300,7 @@ GEM rails (>= 5.0) safe_yaml (>= 0.8.6) sassc - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -333,7 +333,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.15.1) htmlentities - i18n-tasks (~> 0.9.31) + i18n-tasks (~> 0.9.33) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen From cd402b48f98aea135f8f63b8ca18bb0c79649f40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 16:36:25 +0000 Subject: [PATCH 234/767] Bump yard from 0.9.25 to 0.9.26 Bumps [yard](https://github.com/lsegal/yard) from 0.9.25 to 0.9.26. - [Release notes](https://github.com/lsegal/yard/releases) - [Changelog](https://github.com/lsegal/yard/blob/main/CHANGELOG.md) - [Commits](https://github.com/lsegal/yard/compare/v0.9.25...v0.9.26) Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed10b406..6260d2ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,7 @@ GEM htmlentities (4.3.4) i18n (1.8.5) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.31) + i18n-tasks (0.9.33) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -219,7 +219,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -300,7 +300,7 @@ GEM rails (>= 5.0) safe_yaml (>= 0.8.6) sassc - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -310,7 +310,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) - yard (0.9.25) + yard (0.9.26) zeitwerk (2.4.2) PLATFORMS @@ -333,7 +333,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.15.1) htmlentities - i18n-tasks (~> 0.9.31) + i18n-tasks (~> 0.9.33) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen From 3de1f05d09ac988afd9a2ed76c015a54878bd56a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 16:38:03 +0000 Subject: [PATCH 235/767] Bump solargraph from 0.39.17 to 0.40.0 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.39.17 to 0.40.0. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.39.17...v0.40.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dbcb75ea..ef5117e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM execjs backport (1.1.2) bcrypt (3.1.16) - benchmark (0.1.0) + benchmark (0.1.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -138,6 +138,10 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) libv8 (3.16.14.19) listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) @@ -149,7 +153,6 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - maruku (0.7.3) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) @@ -224,7 +227,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (2.0.0) + regexp_parser (2.0.2) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -263,17 +266,17 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.39.17) + solargraph (0.40.0) backport (~> 1.1) benchmark bundler (>= 1.17.2) e2mmap jaro_winkler (~> 1.5) - maruku (~> 0.7, >= 0.7.3) - nokogiri (~> 1.9, >= 1.9.1) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) parser (~> 2.3) reverse_markdown (>= 1.0.5, < 3) - rubocop (~> 0.52) + rubocop (>= 0.52) thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) From fc47a19ac092f9db92a8d77861f7d99e89746814 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 16:40:07 +0000 Subject: [PATCH 236/767] Bump rack-mini-profiler from 2.2.0 to 2.2.1 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dbcb75ea..fda1e128 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - bullet (6.1.0) + bullet (6.1.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -179,7 +179,7 @@ GEM puma (5.1.1) nio4r (~> 2.0) rack (2.2.3) - rack-mini-profiler (2.2.0) + rack-mini-profiler (2.2.1) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) From 79f0387e1f2b99b97e8677b78d3e2b43e9db8ac4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 17:03:21 +0000 Subject: [PATCH 237/767] Bump acts_as_list from 1.0.2 to 1.0.3 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/brendon/acts_as_list/releases) - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.0.2...v1.0.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6eb47503..2475e83b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,14 +73,14 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts_as_list (1.0.2) + acts_as_list (1.0.3) activerecord (>= 4.2) ast (2.4.1) autoprefixer-rails (10.1.0.0) execjs backport (1.1.2) bcrypt (3.1.16) - benchmark (0.1.0) + benchmark (0.1.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -138,6 +138,10 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) libv8 (3.16.14.19) listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) @@ -149,7 +153,6 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - maruku (0.7.3) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) @@ -224,7 +227,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (2.0.0) + regexp_parser (2.0.2) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -263,17 +266,17 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.39.17) + solargraph (0.40.0) backport (~> 1.1) benchmark bundler (>= 1.17.2) e2mmap jaro_winkler (~> 1.5) - maruku (~> 0.7, >= 0.7.3) - nokogiri (~> 1.9, >= 1.9.1) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) parser (~> 2.3) reverse_markdown (>= 1.0.5, < 3) - rubocop (~> 0.52) + rubocop (>= 0.52) thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) @@ -310,7 +313,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) - yard (0.9.25) + yard (0.9.26) zeitwerk (2.4.2) PLATFORMS From 96d4d1f2c391861be33037b1f25bc40b24951af3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 17:03:37 +0000 Subject: [PATCH 238/767] Bump mocha from 1.11.2 to 1.12.0 Bumps [mocha](https://github.com/freerange/mocha) from 1.11.2 to 1.12.0. - [Release notes](https://github.com/freerange/mocha/releases) - [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md) - [Commits](https://github.com/freerange/mocha/compare/v1.11.2...v1.12.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6eb47503..e5bf89e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM execjs backport (1.1.2) bcrypt (3.1.16) - benchmark (0.1.0) + benchmark (0.1.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -138,6 +138,10 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) libv8 (3.16.14.19) listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) @@ -149,7 +153,6 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - maruku (0.7.3) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) @@ -159,7 +162,7 @@ GEM mini_portile2 (2.4.0) minitest (5.14.2) minitest-stub-const (0.6) - mocha (1.11.2) + mocha (1.12.0) mysql2 (0.5.3) nio4r (2.5.4) nokogiri (1.10.10) @@ -224,7 +227,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (2.0.0) + regexp_parser (2.0.2) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -263,17 +266,17 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.39.17) + solargraph (0.40.0) backport (~> 1.1) benchmark bundler (>= 1.17.2) e2mmap jaro_winkler (~> 1.5) - maruku (~> 0.7, >= 0.7.3) - nokogiri (~> 1.9, >= 1.9.1) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) parser (~> 2.3) reverse_markdown (>= 1.0.5, < 3) - rubocop (~> 0.52) + rubocop (>= 0.52) thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) @@ -310,7 +313,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) - yard (0.9.25) + yard (0.9.26) zeitwerk (2.4.2) PLATFORMS From 4597e2124870221a87e2f45a61e9358bbb3427af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Dec 2020 17:25:09 +0000 Subject: [PATCH 239/767] Bump rubocop from 0.93.1 to 1.7.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.1 to 1.7.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.93.1...v1.7.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index d835cc44..4d6d2421 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 0.93', require: false + gem 'rubocop', '~> 1.7', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 254ee98f..4e5dc6a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,13 +235,13 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (0.93.1) + rubocop (1.7.0) parallel (~> 1.10) parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.6.0) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (1.3.0) @@ -352,7 +352,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 0.93) + rubocop (~> 1.7) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From 8b15d613a9595bb13871ab9f44d22b845b08b0de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Dec 2020 05:47:31 +0000 Subject: [PATCH 240/767] Bump rack-mini-profiler from 2.2.1 to 2.3.0 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.2.1...v2.3.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4e5dc6a0..e010fedb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,7 +182,7 @@ GEM puma (5.1.1) nio4r (~> 2.0) rack (2.2.3) - rack-mini-profiler (2.2.1) + rack-mini-profiler (2.3.0) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) From 4d3ca5b51bf63611b042f571abe09b8ebb7beecc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Dec 2020 05:47:42 +0000 Subject: [PATCH 241/767] Bump solargraph from 0.40.0 to 0.40.1 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.40.0 to 0.40.1. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.40.0...v0.40.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4e5dc6a0..1e43cbfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,7 +227,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (2.0.2) + regexp_parser (2.0.3) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -266,7 +266,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.40.0) + solargraph (0.40.1) backport (~> 1.1) benchmark bundler (>= 1.17.2) From a7d5e93828456f777028f02cf9a6e0db66952b2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jan 2021 06:03:44 +0000 Subject: [PATCH 242/767] Bump listen from 3.3.3 to 3.4.0 Bumps [listen](https://github.com/guard/listen) from 3.3.3 to 3.4.0. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.3.3...v3.4.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 80809592..e00abb70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,7 +112,7 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - ffi (1.13.1) + ffi (1.14.2) font-awesome-sass (5.15.1) sassc (>= 1.11) globalid (0.4.2) @@ -143,7 +143,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) libv8 (3.16.14.19) - listen (3.3.3) + listen (3.4.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.8.0) From 5e1aede5a8199bfa907756934c299488700813f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 06:25:19 +0000 Subject: [PATCH 243/767] Bump simplecov from 0.20.0 to 0.21.0 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.20.0...v0.21.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e00abb70..59c21d07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,7 +103,7 @@ GEM crass (1.0.6) database_cleaner (1.8.5) diff-lcs (1.4.4) - docile (1.3.2) + docile (1.3.4) e2mmap (0.1.0) erubi (1.10.0) execjs (2.7.0) @@ -260,7 +260,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - simplecov (0.20.0) + simplecov (0.21.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) From 22a1febf3b5df6bae929b2cc149e34124d56f8c5 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 05:39:07 +0200 Subject: [PATCH 244/767] Add information about the DB volume to the installation document --- doc/installation.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/installation.md b/doc/installation.md index d138c70b..1b7b87b1 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -24,6 +24,16 @@ You can easily run Tracks using Docker Compose. This option mounts the repositor ``` 6. You should now be able to access Tracks in http://localhost:3000 +Note: If you've previously used the Tracks docker-compose installation with a +directory of the same name, the old database might still exist which prevents +it from being re-initialised. If you want to start from scratch, check out the +volume list and remove the volume in question with the following commands: + +``` +$ docker volume list +$ docker volume rm tracks_db-data +``` + ## Docker installation using a separate container You can also install Tracks without Docker Compose. This allows you to use the official Docker containers and you can use your existing database server instead of having a separate one for Tracks. From b9b2a3f5d5262e6fb81dd98b5761f0099e68cc33 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 27 Dec 2020 19:48:28 +0200 Subject: [PATCH 245/767] #2534: Test setting the due date in calendar view. --- test/controllers/todos_controller_test.rb | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index a419492b..79772593 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -346,6 +346,32 @@ class TodosControllerTest < ActionController::TestCase assert_equal 1, t.project_id end + def test_update_todo_due_date + t = Todo.find(1) + login_as(:admin_user) + + due_today_date = Time.zone.now + due_tomorrow_date = due_today_date + 1.day + due_this_week_date = Time.zone.now.end_of_week - 1.day + due_next_week_date = due_this_week_date + 7.days - 1.day + due_this_month_date = Time.zone.now.end_of_month - 1.day + + post :update, xhr: true, params: { :id => 1, :_source_view => 'calendar', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"id"=>"1", "notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>due_today_date.strftime("%d/%m/%Y")}, "tag_list"=>"foo bar" } + assert_response 200 + + post :update, xhr: true, params: { :id => 1, :_source_view => 'calendar', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"id"=>"1", "notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>due_tomorrow_date.strftime("%d/%m/%Y")}, "tag_list"=>"foo bar" } + assert_response 200 + + post :update, xhr: true, params: { :id => 1, :_source_view => 'calendar', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"id"=>"1", "notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>due_this_week_date.strftime("%d/%m/%Y")}, "tag_list"=>"foo bar" } + assert_response 200 + + post :update, xhr: true, params: { :id => 1, :_source_view => 'calendar', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"id"=>"1", "notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>due_next_week_date.strftime("%d/%m/%Y")}, "tag_list"=>"foo bar" } + assert_response 200 + + post :update, xhr: true, params: { :id => 1, :_source_view => 'calendar', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"id"=>"1", "notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>due_this_month_date.strftime("%d/%m/%Y")}, "tag_list"=>"foo bar" } + assert_response 200 + end + def test_update_todo_delete_project t = Todo.find(1) login_as(:admin_user) From 8cdda3c665e648269ab6919fa06058c8c8a2a5f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 05:37:52 +0000 Subject: [PATCH 246/767] Bump simplecov from 0.21.0 to 0.21.1 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.21.0 to 0.21.1. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.21.0...v0.21.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 59c21d07..b4fc7153 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - simplecov (0.21.0) + simplecov (0.21.1) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) From 7272f1c7431773c143447fdf35795a8138993d38 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 07:47:58 +0200 Subject: [PATCH 247/767] #2484: Fix test changing contexts. Why choose at random and occasionally fail when you can just pick useful fixtures? --- test/controllers/todos_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index 79772593..ad2d6f89 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -455,8 +455,8 @@ class TodosControllerTest < ActionController::TestCase # called by dragging a todo to another context container login_as(:admin_user) - todo = users(:admin_user).todos.active.first - context = users(:admin_user).contexts.first + todo = Todo.find(1) + context = Context.find(2) refute_equal todo.context.id, context.id From da4f662aae19909e0973cfeac22edeef98727a6b Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 17:13:03 +0200 Subject: [PATCH 248/767] Add testing for locales --- test/controllers/todos_controller_test.rb | 6 ++++++ test/fixtures/preferences.yml | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index ad2d6f89..3450eccc 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -10,6 +10,12 @@ class TodosControllerTest < ActionController::TestCase # not done / deferred counts ############################ + def test_locale_index + login_as(:other_user_email) + get :index + asser_response 200 + end + def test_not_done_counts login_as(:admin_user) get :index diff --git a/test/fixtures/preferences.yml b/test/fixtures/preferences.yml index e621f9c3..189cbf3f 100644 --- a/test/fixtures/preferences.yml +++ b/test/fixtures/preferences.yml @@ -51,3 +51,21 @@ sms_user_prefs: show_project_on_todo_done: true sms_email: 5555555555@tmomail.net sms_context_id: 13 + +other_user_email_prefs: + id: 4 + user_id: 6 + staleness_starts: 7 + locale: fi + date_format: "%d/%m/%Y" + title_date_format: "%A, %d %B %Y" + show_number_completed: 5 + show_completed_projects_in_sidebar: true + show_hidden_contexts_in_sidebar: true + show_hidden_projects_in_sidebar: true + week_starts: 1 + due_style: 0 + refresh: 0 + time_zone: "London" + verbose_action_descriptors: false + show_project_on_todo_done: true From e1be3b8a95660b6bd70afc162d086723a79570bf Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 19:29:36 +0200 Subject: [PATCH 249/767] Fix the jquery-ui datepicker i18n files' asset compilation --- app/assets/javascripts/application.js | 8 ++++++++ app/helpers/application_helper.rb | 8 ++++---- test/controllers/todos_controller_test.rb | 10 +++++----- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 113fc78d..7fd121ab 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,6 +20,14 @@ //= require jquery-ui/widgets/droppable //= require jquery-ui/effects/effect-highlight //= require jquery-ui/widgets/sortable +//= require jquery-ui/i18n/datepicker-cs +//= require jquery-ui/i18n/datepicker-de +//= require jquery-ui/i18n/datepicker-es +//= require jquery-ui/i18n/datepicker-fi +//= require jquery-ui/i18n/datepicker-fr +//= require jquery-ui/i18n/datepicker-he +//= require jquery-ui/i18n/datepicker-nl +//= require jquery-ui/i18n/datepicker-ru // Stuff in app/assets //= require tracks diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index baa0cdb6..a3a0d3d2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -165,11 +165,11 @@ module ApplicationHelper end def javascript_tag_for_i18n_datepicker - locale = I18n.locale +# locale = I18n.locale # do not include en as locale since this the available by default - if locale && locale != :en - javascript_include_tag("jquery-ui/datepicker-#{locale}") - end +# if locale && locale != :en +# javascript_include_tag("jquery-ui/i18n/datepicker-#{locale}") +# end end def done_path(controller_name, type) diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index 3450eccc..806a2cf2 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -6,16 +6,16 @@ class TodosControllerTest < ActionController::TestCase assert_redirected_to login_url end - ############################ - # not done / deferred counts - ############################ - def test_locale_index login_as(:other_user_email) get :index - asser_response 200 + assert_response 200 end + ############################ + # not done / deferred counts + ############################ + def test_not_done_counts login_as(:admin_user) get :index From bb151b1d3690aa021a6b426658b9d19312e49b11 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 21:48:25 +0200 Subject: [PATCH 250/767] Supporting --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 11d9dbc2..02236c06 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,8 @@ Enjoy being productive! * Original developer: bsag (http://www.rousette.org.uk/) * Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by [Ardcoras oy](https://www.ardcoras.fi/), also available for paid consulting) + * If you want to support the maintainer's work, subscribe to the + [hosted version](https://www.taskitin.fi/). * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors If you are thinking about contributing towards the development of Tracks, From ee2da84f9f467a99105b20c0dd3f2e09deeb2726 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 3 Jan 2021 02:50:23 +0000 Subject: [PATCH 251/767] Translated using Weblate (English) Currently translated at 99.3% (963 of 969 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/en/ --- config/locales/en.yml | 258 ++++++++++++++++++++++++------------------ 1 file changed, 150 insertions(+), 108 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 35dfc4dc..b07a4490 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,4 +1,3 @@ ---- en: activerecord: attributes: @@ -24,7 +23,8 @@ en: staleness_starts: Start of staleness time_zone: Time zone title_date_format: Title date format - verbose_action_descriptors: Show descriptors (context, project) of actions in a verbose form + verbose_action_descriptors: Show descriptors (context, project) of actions + in a verbose form week_starts: Week starts on project: default_context_name: Default context @@ -70,8 +70,8 @@ en: odd: must be odd record_invalid: 'Validation failed: %{errors}' restrict_dependent_destroy: - many: Невозможно удалить запись, так как есть %{record} зависящие от нее - one: Невозможно удалить запись, так как есть %{record} зависящая от нее + one: '' + other: Невозможно удалить запись, так как есть %{record} зависящие от нее taken: has already been taken too_long: is too long (maximum is %{count} characters) too_short: is too short (minimum is %{count} characters) @@ -87,14 +87,13 @@ en: body: 'There were problems with the following fields:' header: one: 1 error prohibited this %{model} from being saved - other: "%{count} errors prohibited this %{model} from being saved" + other: '%{count} errors prohibited this %{model} from being saved' common: action: Action actions: Actions actions_midsentence: - one: action - other: actions - zero: actions + one: actions + other: action add: Add ajaxError: There was an error retrieving from server back: Back @@ -106,9 +105,8 @@ en: contribute: Contribute create: Create days_midsentence: - one: day - other: days - zero: days + one: days + other: day deferred: deferred description: Description drag_handle: DRAG @@ -127,9 +125,8 @@ en: none: None not_available_abbr: n/a note: - one: 1 note - other: "%{count} notes" - zero: no notes + one: no notes + other: 1 note notes: Notes numbered_step: Step %{number} ok: Ok @@ -145,11 +142,13 @@ en: show_all: Show all sort: alphabetically: Alphabetically - alphabetically_confirm: Are you sure that you want to sort these projects alphabetically? This will replace the existing sort order. + alphabetically_confirm: Are you sure that you want to sort these projects alphabetically? + This will replace the existing sort order. alphabetically_title: Sort projects alphabetically by_task_count: By number of tasks by_task_count_title: Sort by number of tasks - by_task_count_title_confirm: Are you sure that you want to sort these projects by the number of tasks? This will replace the existing sort order. + by_task_count_title_confirm: Are you sure that you want to sort these projects + by the number of tasks? This will replace the existing sort order. sort: Sort third: Third todo: todo @@ -167,7 +166,9 @@ en: context_name: Context name context_state: Context state delete_context: Delete context - delete_context_confirmation: Are you sure that you want to delete the context '%{name}'? Be aware that this will also delete all (recurring) actions in this context! + delete_context_confirmation: Are you sure that you want to delete the context + '%{name}'? Be aware that this will also delete all (recurring) actions in this + context! delete_context_title: Delete context edit_context: Edit context hidden_contexts: Hidden contexts @@ -265,28 +266,26 @@ en: other: almost %{count} years half_a_minute: half a minute less_than_x_minutes: - one: less than a minute - other: less than %{count} minutes - zero: less than 1 minute + one: less than 1 minute + other: less than a minute less_than_x_seconds: one: less than 1 second - other: less than %{count} seconds - zero: less than 1 second + other: less than 1 second over_x_years: one: over 1 year other: over %{count} years x_days: one: 1 day - other: "%{count} days" + other: '%{count} days' x_minutes: one: 1 minute - other: "%{count} minutes" + other: '%{count} minutes' x_months: one: 1 month - other: "%{count} months" + other: '%{count} months' x_seconds: one: 1 second - other: "%{count} seconds" + other: '%{count} seconds' prompts: day: Day hour: Hour @@ -297,29 +296,30 @@ en: errors: format: "%{attribute} %{message}" messages: - accepted: должен быть подтвержден - blank: должна быть заполнена - confirmation: не соответствует %{attribute} - empty: не может быть пустым - equal_to: должно равняться %{count} - even: должно быть четным - exclusion: зарезервированно - greater_than: должно быть больше %{count} - greater_than_or_equal_to: должно быть больше или равно %{count} - inclusion: не входит в список - invalid: неверное - less_than: должно быть меньше %{count} - less_than_or_equal_to: должно быть меньше или равно %{count} - not_a_number: не является числом - not_an_integer: должно быть целым числом - odd: должно быть нечетным - other_than: должно отличаться от %{count} - present: должно быть пустым - taken: уже занято - too_long: 'слишком длинное (максимум: %{count} символов)' - too_short: 'слишком кроткое (минимум: %{count} символов)' - wrong_length: неверной длины (должно быть %{count} символов) - user_unauthorized: '401 Unauthorized: Only administrative users are allowed access to this function.' + accepted: must be accepted + blank: can't be blank + confirmation: doesn't match %{attribute} + empty: can't be empty + equal_to: must be equal to %{count} + even: must be even + exclusion: is reserved + greater_than: must be greater than %{count} + greater_than_or_equal_to: must be greater than or equal to %{count} + inclusion: is not included in the list + invalid: is invalid + less_than: must be less than %{count} + less_than_or_equal_to: must be less than or equal to %{count} + not_a_number: is not a number + not_an_integer: must be an integer + odd: must be odd + other_than: must be other than %{count} + present: must be blank + taken: has already been taken + too_long: 'is too long (maximum is %{count} characters)' + too_short: 'is too short (minimum is %{count} characters)' + wrong_length: is the wrong length (should be %{count} characters) + user_unauthorized: '401 Unauthorized: Only administrative users are allowed access + to this function.' feedlist: actions_completed_last_week: Actions completed in the last 7 days actions_due_next_week: Actions due in 7 days or earlier @@ -332,14 +332,19 @@ en: choose_context: Choose the context you want a feed of choose_project: Choose the project you want a feed of context_centric_actions: Feeds for incomplete actions in a specific context - context_needed: There needs to be at least one context before you can request a feed + context_needed: There needs to be at least one context before you can request + a feed ical_feed: iCal feed last_fixed_number: Last %{number} actions legend: 'Legend:' - notice_incomplete_only: 'Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page' + notice_incomplete_only: 'Note: All feeds show only actions that have not been + marked as done, unless stated otherwise. These iCal feeds can be added to todo + lists. If you want to show due todos in a calendar, use the iCal feed on the + calendar page' plain_text_feed: Plain Text Feed project_centric: Feeds for incomplete actions in a specific project - project_needed: There needs to be at least one project before you can request a feed + project_needed: There needs to be at least one project before you can request + a feed projects_and_actions: Active projects with their actions rss_feed: RSS Feed select_feed_for_context: Select the feed for this context @@ -348,11 +353,11 @@ en: send_feedback: Send feedback on %{version} helpers: select: - prompt: Выберите + prompt: Please select submit: - create: Создать %{model} - submit: Сохранить %{model} - update: Обновить %{model} + create: Create %{model} + submit: Save %{model} + update: Update %{model} integrations: opensearch_description: Search in Tracks layouts: @@ -459,8 +464,10 @@ en: todo: error_date_must_be_future: must be a date in the future user: - error_context_not_associated: Context id %{context} not associated with user id %{user}. - error_project_not_associated: Project id %{project} not associated with user id %{user}. + error_context_not_associated: Context id %{context} not associated with user + id %{user}. + error_project_not_associated: Project id %{project} not associated with user + id %{user}. notes: delete_confirmation: Are you sure that you want to delete the note '%{id}'? delete_item_title: Delete item @@ -469,7 +476,8 @@ en: deleted_note: Deleted note '%{id}' edit_item_title: Edit item in_project: 'In: ' - no_notes_available: 'Currently there are no notes: add notes to projects from individual project pages.' + no_notes_available: 'Currently there are no notes: add notes to projects from + individual project pages.' note_header: Note %{id} note_link_title: Show note %{id} note_location_link: 'In:' @@ -480,14 +488,14 @@ en: format: delimiter: "," format: "%u%n" - precision: 2 + precision: '2' separator: "." significant: Significant strip_insignificant_zeros: Strip insignificant zeros unit: "$" format: delimiter: "," - precision: 3 + precision: '3' separator: "." significant: Significant strip_insignificant_zeros: Strip insignificant zeros @@ -495,15 +503,15 @@ en: decimal_units: format: "%n %u" units: - billion: Миллиард - million: Миллион - quadrillion: Квадрильон - thousand: Тысяча - trillion: Триллион + billion: Billion + million: Million + quadrillion: Quadrillion + thousand: Thousand + trillion: Trillion unit: "." format: delimiter: '' - precision: 1 + precision: '1' significant: 'true' strip_insignificant_zeros: 'true' storage_units: @@ -531,14 +539,17 @@ en: current_authentication_type: Your authentication type is %{auth_type} edit_preferences: Edit preferences generate_new_token: Generate a new token - generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. + generate_new_token_confirm: Are you sure? Generating a new token will replace + the existing one and break any external usages of this token. is_false: 'false' is_true: 'true' open_id_url: Your OpenID URL is page_title: TRACKS::Preferences page_title_edit: TRACKS::Edit Preferences password_changed: You password has been changed, please log on again. - remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + remove_introduction: You can remove your user account here. Note that this is + irreversible and will remove all your data! After removal you will be logged + out. show_number_completed: Show %{number} completed items sms_context_none: None staleness_starts_after: Staleness starts after %{days} days @@ -570,7 +581,8 @@ en: deferred_actions: Deferred actions deferred_actions_empty: Deferred actions empty delete_project: Delete project - delete_project_confirmation: Are you sure that you want to delete the project '%{name}'? + delete_project_confirmation: Are you sure that you want to delete the project + '%{name}'? delete_project_title: Delete the project edit_project_settings: Edit Project Settings edit_project_title: Edit project @@ -676,10 +688,13 @@ en: action_selection_title: TRACKS::Action selection actions: Actions actions_30days_title: Actions in the last 30 days - actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions + actions_actions_avg_created_30days: In the last 30 days you created on average + %{count} actions actions_avg_completed: and completed an average of %{count} actions per month. - actions_avg_completed_30days: and completed an average of %{count} actions per day. - actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. + actions_avg_completed_30days: and completed an average of %{count} actions per + day. + actions_avg_completion_time: Of all your completed actions, the average time to + complete is %{count} days. actions_avg_created: In the last 12 months you created on average %{count} actions actions_day_of_week_legend: day_of_week: Day of the week @@ -700,10 +715,12 @@ en: 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} and further. + click_to_show_actions_from_week: Click %{link} to show the actions from week %{week} + and further. click_to_update_actions: Click on a bar in the chart to update the actions below. contexts: Contexts - current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions + current_running_time_of_incomplete_visible_actions: Current running time of incomplete + visible actions index_title: TRACKS::Statistics labels: avg_completed: Avg completed @@ -720,7 +737,8 @@ en: number_of_days: Number of days ago percentage: Percentage running_time: Running time of an action (weeks) - more_stats_will_appear: More statistics will appear here once you have added some actions. + more_stats_will_appear: More statistics will appear here once you have added some + actions. no_actions_selected: There are no actions selected. no_tags_available: no tags available open_per_week: Active (visible and hidden) next actions per week @@ -739,10 +757,13 @@ en: percentage: Percentage weeks: Running time of an action (weeks). Click on a bar for more info spread_of_actions_for_all_context: Spread of actions for all contexts - spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts - tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. + spread_of_running_actions_for_visible_contexts: Spread of running actions for + visible contexts + tag_cloud_90days_description: This tag cloud includes tags of actions that were + created or completed in the past 90 days. tag_cloud_90days_title: Tag cloud actions in past 90 days - tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) + tag_cloud_description: This tag cloud includes tags of all actions (completed, + not completed, visible and/or hidden) tag_cloud_title: Tag cloud for all actions tags: Tags time_of_day: Time of day (all actions) @@ -757,7 +778,8 @@ en: top10_projects: Top 10 projects top10_projects_30days: Top 10 project in past 30 days top5_contexts: Top 5 contexts - top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions + top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete + actions totals: Totals totals_action_count: you have a total of %{count} actions totals_actions_completed: "%{count} of these are completed." @@ -797,8 +819,10 @@ en: action_deleted_error: Failed to delete the action action_deleted_success: Successfully deleted next action action_due_on: "(action due on %{date})" - action_marked_complete: The action '%{description}' was marked as %{completed} - action_marked_complete_error: The action '%{description}' was NOT marked as %{completed} due to an error on the server. + action_marked_complete: The action '%{description}' was marked + as %{completed} + action_marked_complete_error: The action '%{description}' was + NOT marked as %{completed} due to an error on the server. action_saved: Action saved action_saved_to_tickler: Action saved to tickler actions: @@ -836,7 +860,8 @@ en: due_today: Due today get_in_ical_format: Get this calendar in iCal format calendar_page_title: TRACKS::Calendar - cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! + cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency + to a completed action! clear_due_date: Clear due date clear_show_from_date: Clear show from date completed: Completed @@ -847,7 +872,8 @@ en: other: There are %{count} completed actions in the archive. completed_last_day: Completed in the last 24 hours completed_last_x_days: Completed in the last %{count} days - completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed + completed_recurrence_completed: There is no next action after the recurring action + you just deleted. The recurrence is completed completed_recurring: Completed recurring todos completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Completed in the rest of this month @@ -859,7 +885,8 @@ en: confirm_delete: Are you sure that you want to delete the action '%{description}'? context_changed: Context changed to %{name} convert_to_project: Make project - defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. + defer_date_after_due_date: Defer date is after due date. Please edit and adjust + due date before deferring. defer_x_days: one: Defer 1 day other: Defer %{count} days @@ -868,13 +895,15 @@ en: deferred_tasks_title: TRACKS::Tickler delete: Delete delete_action: Delete action - delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'? + delete_recurring_action_confirm: Are you sure that you want to delete the recurring + action '%{description}'? delete_recurring_action_title: Delete the recurring action deleted_success: The action was deleted successfully. depends_on: Depends on depends_on_separate_with_commas: Depends on (separate with commas) done: Done? - drag_action_title: Drag onto another action to mark that action as a dependency for this action. + drag_action_title: Drag onto another action to mark that action as a dependency + for this action. due: Due edit: Edit edit_action: Edit action @@ -883,7 +912,8 @@ en: error: invalid_due_date: Invalid due date invalid_show_from_date: Invalid show from date - error_completing_todo: There was an error completing / activating the recurring todo %{description} + error_completing_todo: There was an error completing / activating the recurring + todo %{description} error_deleting_item: There was an error deleting the item %{description} error_deleting_recurring: There was an error deleting the recurring todo '%{description}' error_removing_dependency: There was an error removing the dependency @@ -903,10 +933,12 @@ en: in_hidden_state: in hidden state in_pending_state: in pending state list_incomplete_next_actions: Lists incomplete next actions - list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions + list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next + actions mark_complete: Mark complete mobile_todos_page_title: All actions - new_related_todo_created: A new todo was added which belongs to this recurring todo + new_related_todo_created: A new todo was added which belongs to this recurring + todo new_related_todo_created_short: created a new todo new_related_todo_not_created_short: did not create todo next_action_description: Next action description @@ -1035,9 +1067,11 @@ en: yearly_every_x_day: Every %{month} %{day} yearly_every_xth_day: The %{day} %{day_of_week} of %{month} yearly_options: Settings for yearly recurring actions - recurrence_completed: There is no next action after the recurring action you just finished. The recurrence is completed + recurrence_completed: There is no next action after the recurring action you just + finished. The recurrence is completed recurrence_period: Recurrence period - recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added + recurring_action_deleted: Action was deleted. Because this action is recurring, + a new action was added recurring_action_saved: Recurring action saved recurring_actions_title: TRACKS::Recurring Actions recurring_deleted_success: The recurring action was deleted successfully. @@ -1061,32 +1095,38 @@ en: 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 to an existing action. This value will not be saved with the rest of the action. Continue? + unresolved_dependency: The value you entered in the dependency field did not resolve + to an existing action. This value will not be saved with the rest of the action. + Continue? was_due_on_date: was due on %{date} users: account_signup: Account signup approve_tos: I approve the Terms of Service auth_change_submit: Change authentication type - auth_type_update_error: 'There was a problem updating your authentication type: %{error_messages}' + auth_type_update_error: 'There was a problem updating your authentication type: + %{error_messages}' auth_type_updated: Authentication type updated. change_auth_type_title: TRACKS::Change authentication type change_authentication_type: Change authentication type - change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. + change_password_prompt: Enter your new password in the fields below and click + 'Change password' to replace your current password with your new one. change_password_submit: Change password change_password_title: TRACKS::Change password choose_password: Choose password confirm_password: Confirm password desired_login: Desired login - destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their actions, contexts, project and notes. Are you sure that you want to continue?' + destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their + actions, contexts, project and notes. Are you sure that you want to continue?' destroy_error: There was an error deleting the user %{login} destroy_successful: User %{login} was successfully destroyed destroy_user: Destroy user email_address: Email address failed_to_delete_user: Failed to delete user %{username} - first_user_heading: 'Welcome to TRACKS. To get started, please create an admin account:' + first_user_heading: 'Welcome to TRACKS. To get started, please create an admin + account:' first_user_title: TRACKS::Sign up as the admin user identity_url: Identity URL label_auth_type: Authentication type @@ -1097,12 +1137,15 @@ en: new_user_heading: 'Sign up a new user:' new_user_title: TRACKS::Sign up no_signups_title: TRACKS::No signups - openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. - openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. + openid_ok_pref_failed: You have successfully verified %{url} as your identity + but there was a problem saving your authentication preferences. + openid_url_verified: You have successfully verified %{url} as your identity and + set your authentication type to OpenID. password_confirmation_label: Confirm password password_updated: Password updated. register_with_cas: With your CAS username - select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. + select_authentication_type: Select your new authentication type and click 'Change + authentication type' to replace your current settings. signup: Signup signup_new_user: Sign up new user signup_successful: Signup successful for user %{username}. @@ -1119,14 +1162,13 @@ en: next_label: Next → page_entries_info: multi_page: Displaying %{model} %{from} - %{to} of %{count} in total - multi_page_html: Displaying %{model} %{from} - %{to} of %{count} in total + multi_page_html: Displaying %{model} %{from} - %{to} of %{count} + in total single_page: - one: Displaying 1 %{model} - other: Displaying all %{count} %{model} - zero: No %{model} found + one: No %{model} found + other: Displaying 1 %{model} single_page_html: - one: Displaying 1 %{model} - other: Displaying all %{count} %{model} - zero: No %{model} found + one: No %{model} found + other: Displaying 1 %{model} page_gap: "…" previous_label: "← Previous" From aa957b400806e065269fff3efdc5b0ffecd76ce8 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 3 Jan 2021 02:27:16 +0000 Subject: [PATCH 252/767] Translated using Weblate (Finnish) Currently translated at 96.6% (937 of 969 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/ --- config/locales/fi.yml | 252 +++++++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 104 deletions(-) diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 41a5008b..3cfd09cd 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1,4 +1,3 @@ ---- fi: activerecord: attributes: @@ -7,25 +6,25 @@ fi: updated_at: Päivitetty preference: date_format: Päivämäärämuoto - due_style: Due style + due_style: Määräpäivän esitystapa first_name: Etunimi last_name: Sukunimi locale: Kieli mobile_todos_per_page: Toimenpidettä sivulla (mobiilisivustolla) - refresh: Refresh interval (in minutes) - review_period: Project review interval - show_completed_projects_in_sidebar: Show completed projects in sidebar + refresh: Päivitystiheys (minuutteina) + review_period: Projektin tarkistusväli + show_completed_projects_in_sidebar: Näytä valmistuneet projektit sivupalkissa show_hidden_contexts_in_sidebar: Näytä piilotetut asiayhteydet sivupalkissa show_hidden_projects_in_sidebar: Näytä piilotetut projektit sivupalkissa - show_number_completed: Show number of completed actions - show_project_on_todo_done: Go to project page on completing todo + show_number_completed: Näytä valmistuneiden toimenpiteiden määrä + show_project_on_todo_done: Siirry projektinäkymään toimenpiteen valmistuessa sms_context: Sähköpostin oletusasiayhteys - sms_email: From email + sms_email: Lähettäjän sähköpostiosoite staleness_starts: Vanhentumisen alkaminen time_zone: Aikavyöhyke - title_date_format: Title date format + title_date_format: Otsakkeen päivämäärämuoto verbose_action_descriptors: Verbose action descriptors - week_starts: Week starts on + week_starts: Viikko alkaa project: default_context_name: Oletuskonteksti default_tags: Oletustagit @@ -53,25 +52,25 @@ fi: full_messages: format: "%{attribute} %{message}" messages: - accepted: must be accepted - blank: can't be blank - confirmation: doesn't match confirmation - empty: can't be empty - equal_to: must be equal to %{count} - even: must be even + accepted: täytyy hyväksyä + blank: ei voi olla tyhjä + confirmation: ei vastaa vahvistusarvoa + empty: ei voi olla tyhjä + equal_to: täytyy olla sama kuin %{count} + even: täytyy olla tasan exclusion: is reserved - greater_than: must be greater than %{count} - greater_than_or_equal_to: must be greater than or equal to %{count} - inclusion: is not included in the list + greater_than: täytyy olla suurempi kuin %{count} + greater_than_or_equal_to: täytyy olla suurempi tai yhtäsuuri kuin %{count} + inclusion: ei sisälly listaan invalid: cannot contain the comma (',') character - less_than: must be less than %{count} - less_than_or_equal_to: must be less than or equal to %{count} + less_than: täytyy olla vähemmän kuin %{count} + less_than_or_equal_to: täytyy olla vähemmän tai yhtäsuuri kuin %{count} not_a_number: is not a number - odd: must be odd - record_invalid: 'Validation failed: %{errors}' + odd: täytyy olla pariton + record_invalid: 'Validointi epäonnistui: %{errors}' restrict_dependent_destroy: - many: Невозможно удалить запись, так как есть %{record} зависящие от нее one: Невозможно удалить запись, так как есть %{record} зависящая от нее + other: Невозможно удалить запись, так как есть %{record} зависящие от нее taken: has already been taken too_long: is too long (maximum is %{count} characters) too_short: is too short (minimum is %{count} characters) @@ -80,21 +79,20 @@ fi: project: attributes: name: - blank: project must have a name - taken: already exists - too_long: project name must be less than 256 characters + blank: projektilla on oltava nimi + taken: on jo olemassa + too_long: projektin nimen tulee olla alle 256 merkkiä pitkä template: - body: 'There were problems with the following fields:' + body: 'Seuraavissa kentissä on virheitä:' header: - one: 1 error prohibited this %{model} from being saved - other: "%{count} errors prohibited this %{model} from being saved" + one: 1 virhe esti tämän %{model} tallentamisen + other: '%{count} virhettä estivät tämän %{model} tallentamisen' common: action: Toimenpide actions: Toimenpiteet actions_midsentence: - one: toimenpide - other: toimenpidettä - zero: toimenpidettä + one: toimenpidettä + other: toimenpide add: Lisää ajaxError: Virhe noudettaessa palvelimelta back: Takaisin @@ -106,9 +104,8 @@ fi: contribute: Osallistu create: Luo days_midsentence: - one: päivä - other: päivää - zero: päivää + one: päivää + other: päivä deferred: lykätty description: Kuvaus drag_handle: VEDÄ @@ -127,9 +124,8 @@ fi: none: Ei not_available_abbr: ei note: - one: 1 muistiinpano - other: "%{count} muistiinpanoa" - zero: ei muistiinpanoja + one: ei muistiinpanoja + other: 1 muistiinpano notes: Muistiinpanot numbered_step: Askel %{number} ok: Ok @@ -145,11 +141,13 @@ fi: show_all: Näytä kaikki sort: alphabetically: Aakkosjärjestyksessä - alphabetically_confirm: Haluatko varmasti lajitella nämä projektit aakkosjärjestykseen? Tämä korvaa nykyisen lajittelujärjestyksen. + alphabetically_confirm: Haluatko varmasti lajitella nämä projektit aakkosjärjestykseen? + Tämä korvaa nykyisen lajittelujärjestyksen. alphabetically_title: Lajittele projektit aakkosjärjestykseen by_task_count: Tehtävämäärän mukaan by_task_count_title: Lajittele tehtävämäärän mukaan - by_task_count_title_confirm: Haluatko varmasti lajitella nämä projektit tehtävämäärän mukaan? Tämä korvaa nykyisen lajittelujärjestyksen. + by_task_count_title_confirm: Haluatko varmasti lajitella nämä projektit tehtävämäärän + mukaan? Tämä korvaa nykyisen lajittelujärjestyksen. sort: Lajittele third: Kolmas todo: tehtävä @@ -160,14 +158,17 @@ fi: wiki: Wiki contexts: add_context: Lisää asiayhteys - all_completed_tasks_title: TRACKS::All Completed actions in the context '%{context_name}' - completed_tasks_title: TRACKS::Completed actions in the context '%{context_name}' - context_deleted: Deleted context '%{name}' + all_completed_tasks_title: TRACKS::Kaikki valmistuneet toimenpiteet asiayhteydessä + '%{context_name}' + completed_tasks_title: TRACKS::Valmistuneet toimenpiteet asiayhteydessä '%{context_name}' + context_deleted: Poistettu asiayhteys '%{name}' context_hide: Piilota etusivulta? context_name: Asiayhteyden nimi context_state: Asiayhteyden tila delete_context: Poista asiayhteys - delete_context_confirmation: Are you sure that you want to delete the context '%{name}'? Be aware that this will also delete all (recurring) actions in this context! + delete_context_confirmation: Are you sure that you want to delete the context + '%{name}'? Be aware that this will also delete all (recurring) actions in this + context! delete_context_title: Poista asiayhteys edit_context: Muokkaa asiayhteyttä hidden_contexts: Piilotetut asiayhteydet @@ -191,7 +192,7 @@ fi: data: import_destination_invalid: Invalid import destination import_errors: Some errors occurred during import - import_successful: Tuonti onnistui + import_successful: Tuonti onnistui. invalid_import_destination: Invalid import destination date: abbr_day_names: @@ -265,28 +266,26 @@ fi: other: almost %{count} years half_a_minute: half a minute less_than_x_minutes: - one: less than a minute - other: less than %{count} minutes - zero: less than 1 minute + one: less than 1 minute + other: less than a minute less_than_x_seconds: one: less than 1 second - other: less than %{count} seconds - zero: less than 1 second + other: less than 1 second over_x_years: one: over 1 year other: over %{count} years x_days: one: 1 day - other: "%{count} days" + other: '%{count} days' x_minutes: one: 1 minute - other: "%{count} minutes" + other: '%{count} minutes' x_months: one: 1 month - other: "%{count} months" + other: '%{count} months' x_seconds: one: 1 second - other: "%{count} seconds" + other: '%{count} seconds' prompts: day: Day hour: Hour @@ -332,14 +331,19 @@ fi: choose_context: Choose the context you want a feed of choose_project: Choose the project you want a feed of context_centric_actions: Feeds for incomplete actions in a specific context - context_needed: There needs to be at least one context before you can request a feed + context_needed: There needs to be at least one context before you can request + a feed ical_feed: iCal feed last_fixed_number: Last %{number} actions legend: 'Legend:' - notice_incomplete_only: 'Note: All feeds show only actions that have not been marked as done, unless stated otherwise. These iCal feeds can be added to todo lists. If you want to show due todos in a calendar, use the iCal feed on the calendar page' + notice_incomplete_only: 'Note: All feeds show only actions that have not been + marked as done, unless stated otherwise. These iCal feeds can be added to todo + lists. If you want to show due todos in a calendar, use the iCal feed on the + calendar page' plain_text_feed: Plain Text Feed project_centric: Feeds for incomplete actions in a specific project - project_needed: There needs to be at least one project before you can request a feed + project_needed: There needs to be at least one project before you can request + a feed projects_and_actions: Active projects with their actions rss_feed: RSS Feed select_feed_for_context: Select the feed for this context @@ -459,8 +463,10 @@ fi: todo: error_date_must_be_future: must be a date in the future user: - error_context_not_associated: Context id %{context} not associated with user id %{user}. - error_project_not_associated: Project id %{project} not associated with user id %{user}. + error_context_not_associated: Context id %{context} not associated with user + id %{user}. + error_project_not_associated: Project id %{project} not associated with user + id %{user}. notes: delete_confirmation: Oletko varma, että haluat poistaa muistiinpanon '%{id}'? delete_item_title: Poista @@ -469,7 +475,8 @@ fi: deleted_note: Muistiinpano '%{id}' poistettu edit_item_title: Muokkaa in_project: 'Kuuluu: ' - no_notes_available: Muistiinpanoja ei löytynyt. Voit lisätä niitä projekteihin projektisivulta. + no_notes_available: Muistiinpanoja ei löytynyt. Voit lisätä niitä projekteihin + projektisivulta. note_header: Muistiinpano %{id} note_link_title: Show note %{id} note_location_link: 'Kuuluu:' @@ -480,14 +487,14 @@ fi: format: delimiter: " " format: "%u%n" - precision: 2 + precision: '2' separator: "," significant: Significant strip_insignificant_zeros: Strip insignificant zeros unit: "€" format: delimiter: " " - precision: 3 + precision: '3' separator: "," significant: Significant strip_insignificant_zeros: Strip insignificant zeros @@ -503,7 +510,7 @@ fi: unit: "." format: delimiter: '' - precision: 1 + precision: '1' significant: 'true' strip_insignificant_zeros: 'true' storage_units: @@ -531,14 +538,17 @@ fi: current_authentication_type: Your authentication type is %{auth_type} edit_preferences: Muokkaa asetuksia generate_new_token: Luo uusi avainkoodi - generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token. + generate_new_token_confirm: Are you sure? Generating a new token will replace + the existing one and break any external usages of this token. is_false: 'false' is_true: 'true' open_id_url: Your OpenID URL is page_title: TRACKS::Asetukset page_title_edit: TRACKS::Muokkaa asetuksia password_changed: Salasanasi on muutettu, kirjaudu uudelleen sisään. - remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + remove_introduction: You can remove your user account here. Note that this is + irreversible and will remove all your data! After removal you will be logged + out. show_number_completed: Näytä %{number} valmista toimenpidettä sms_context_none: Ei mikään staleness_starts_after: Toimenpide alkaa vanhentumaan %{days} päivän kuluttua @@ -570,7 +580,8 @@ fi: deferred_actions: Deferred actions deferred_actions_empty: Deferred actions empty delete_project: Delete project - delete_project_confirmation: Are you sure that you want to delete the project '%{name}'? + delete_project_confirmation: Are you sure that you want to delete the project + '%{name}'? delete_project_title: Delete the project edit_project_settings: Muokkaa projektin asetuksia edit_project_title: Edit project @@ -676,10 +687,13 @@ fi: action_selection_title: TRACKS::Action selection actions: Actions actions_30days_title: Actions in the last 30 days - actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions + actions_actions_avg_created_30days: In the last 30 days you created on average + %{count} actions actions_avg_completed: and completed an average of %{count} actions per month. - actions_avg_completed_30days: and completed an average of %{count} actions per day. - actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days. + actions_avg_completed_30days: and completed an average of %{count} actions per + day. + actions_avg_completion_time: Of all your completed actions, the average time to + complete is %{count} days. actions_avg_created: In the last 12 months you created on average %{count} actions actions_day_of_week_legend: day_of_week: Day of the week @@ -700,10 +714,12 @@ fi: 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} and further. + click_to_show_actions_from_week: Click %{link} to show the actions from week %{week} + and further. click_to_update_actions: Click on a bar in the chart to update the actions below. contexts: Contexts - current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions + current_running_time_of_incomplete_visible_actions: Current running time of incomplete + visible actions index_title: TRACKS::Tilastot labels: avg_completed: Avg completed @@ -720,7 +736,8 @@ fi: number_of_days: Number of days ago percentage: Percentage running_time: Running time of an action (weeks) - more_stats_will_appear: More statistics will appear here once you have added some actions. + more_stats_will_appear: More statistics will appear here once you have added some + actions. no_actions_selected: There are no actions selected. no_tags_available: no tags available open_per_week: Active (visible and hidden) next actions per week @@ -739,10 +756,13 @@ fi: percentage: Percentage weeks: Running time of an action (weeks). Click on a bar for more info spread_of_actions_for_all_context: Spread of actions for all contexts - spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts - tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days. + spread_of_running_actions_for_visible_contexts: Spread of running actions for + visible contexts + tag_cloud_90days_description: This tag cloud includes tags of actions that were + created or completed in the past 90 days. tag_cloud_90days_title: Tag cloud actions in past 90 days - tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden) + tag_cloud_description: This tag cloud includes tags of all actions (completed, + not completed, visible and/or hidden) tag_cloud_title: Tag cloud for all actions tags: Tags time_of_day: Time of day (all actions) @@ -757,7 +777,8 @@ fi: top10_projects: Top 10 projects top10_projects_30days: Top 10 project in past 30 days top5_contexts: Top 5 contexts - top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions + top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete + actions totals: Totals totals_action_count: you have a total of %{count} actions totals_actions_completed: "%{count} of these are completed." @@ -797,8 +818,10 @@ fi: action_deleted_error: Failed to delete the action action_deleted_success: Successfully deleted next action action_due_on: "(määräaika %{date})" - action_marked_complete: The action '%{description}' was marked as %{completed} - action_marked_complete_error: The action '%{description}' was NOT marked as %{completed} due to an error on the server. + action_marked_complete: The action '%{description}' was marked + as %{completed} + action_marked_complete_error: The action '%{description}' was + NOT marked as %{completed} due to an error on the server. action_saved: Action saved action_saved_to_tickler: Action saved to tickler actions: @@ -836,7 +859,8 @@ fi: due_today: Tehtävä tänään get_in_ical_format: Get this calendar in iCal format calendar_page_title: TRACKS::Kalenteri - cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! + cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency + to a completed action! clear_due_date: Clear due date clear_show_from_date: Clear show from date completed: Completed @@ -847,7 +871,8 @@ fi: other: There are %{count} completed actions in the archive. completed_last_day: Completed in the last 24 hours completed_last_x_days: Completed in the last %{count} days - completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed + completed_recurrence_completed: There is no next action after the recurring action + you just deleted. The recurrence is completed completed_recurring: Completed recurring todos completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Completed in the rest of this month @@ -859,7 +884,8 @@ fi: confirm_delete: Are you sure that you want to delete the action '%{description}'? context_changed: Context changed to %{name} convert_to_project: Make project - defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring. + defer_date_after_due_date: Defer date is after due date. Please edit and adjust + due date before deferring. defer_x_days: one: Defer 1 day other: Defer %{count} days @@ -868,13 +894,15 @@ fi: deferred_tasks_title: TRACKS::Tulevat delete: Delete delete_action: Delete action - delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'? + delete_recurring_action_confirm: Are you sure that you want to delete the recurring + action '%{description}'? delete_recurring_action_title: Delete the recurring action deleted_success: The action was deleted successfully. depends_on: Depends on depends_on_separate_with_commas: Depends on (separate with commas) done: Done? - drag_action_title: Drag onto another action to mark that action as a dependency for this action. + drag_action_title: Drag onto another action to mark that action as a dependency + for this action. due: Due edit: Edit edit_action: Edit action @@ -883,7 +911,8 @@ fi: error: invalid_due_date: Invalid due date invalid_show_from_date: Invalid show from date - error_completing_todo: There was an error completing / activating the recurring todo %{description} + error_completing_todo: There was an error completing / activating the recurring + todo %{description} error_deleting_item: There was an error deleting the item %{description} error_deleting_recurring: There was an error deleting the recurring todo '%{description}' error_removing_dependency: There was an error removing the dependency @@ -903,10 +932,12 @@ fi: in_hidden_state: in hidden state in_pending_state: in pending state list_incomplete_next_actions: Lists incomplete next actions - list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions + list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next + actions mark_complete: Merkitse valmiiksi mobile_todos_page_title: All actions - new_related_todo_created: A new todo was added which belongs to this recurring todo + new_related_todo_created: A new todo was added which belongs to this recurring + todo new_related_todo_created_short: created a new todo new_related_todo_not_created_short: did not create todo next_action_description: Next action description @@ -941,9 +972,11 @@ fi: due_today: No actions due today hidden: Currently there are no hidden actions found not_done: Currently there are no incomplete actions - not_done_context: Tähän kontekstiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt + not_done_context: Tähän kontekstiin kuuluvia keskeneräisiä toimenpiteitä ei + löytynyt not_done_project: Tähän projektiin kuuluvia keskeneräisiä toimenpiteitä ei löytynyt - not_done_with_tag: Tagilla '%{param}' merkittyjä keskeneräisiä toimenpiteitä ei löytynyt + not_done_with_tag: Tagilla '%{param}' merkittyjä keskeneräisiä toimenpiteitä + ei löytynyt project: Currently there are no incomplete actions in this project recurring_todos: Currently there are no recurring todos tag_hidden: Currently there are no hidden actions found @@ -1035,9 +1068,11 @@ fi: yearly_every_x_day: Joka %{month} %{day} yearly_every_xth_day: The %{day} %{day_of_week} of %{month} yearly_options: Settings for yearly recurring actions - recurrence_completed: There is no next action after the recurring action you just finished. The recurrence is completed + recurrence_completed: There is no next action after the recurring action you just + finished. The recurrence is completed recurrence_period: Toistuvuusjakso - recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added + recurring_action_deleted: Action was deleted. Because this action is recurring, + a new action was added recurring_action_saved: Recurring action saved recurring_actions_title: TRACKS::Recurring Actions recurring_deleted_success: The recurring action was deleted successfully. @@ -1061,32 +1096,38 @@ fi: 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 to an existing action. This value will not be saved with the rest of the action. Continue? + unresolved_dependency: The value you entered in the dependency field did not resolve + to an existing action. This value will not be saved with the rest of the action. + Continue? was_due_on_date: was due on %{date} users: account_signup: Account signup approve_tos: I approve the Terms of Service auth_change_submit: Change authentication type - auth_type_update_error: 'There was a problem updating your authentication type: %{error_messages}' + auth_type_update_error: 'There was a problem updating your authentication type: + %{error_messages}' auth_type_updated: Authentication type updated. change_auth_type_title: TRACKS::Change authentication type change_authentication_type: Change authentication type - change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one. + change_password_prompt: Enter your new password in the fields below and click + 'Change password' to replace your current password with your new one. change_password_submit: Change password change_password_title: TRACKS::Change password choose_password: Choose password confirm_password: Confirm password desired_login: Desired login - destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their actions, contexts, project and notes. Are you sure that you want to continue?' + destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their + actions, contexts, project and notes. Are you sure that you want to continue?' destroy_error: There was an error deleting the user %{login} destroy_successful: User %{login} was successfully destroyed destroy_user: Destroy user email_address: Email address failed_to_delete_user: Failed to delete user %{username} - first_user_heading: 'Welcome to TRACKS. To get started, please create an admin account:' + first_user_heading: 'Welcome to TRACKS. To get started, please create an admin + account:' first_user_title: TRACKS::Sign up as the admin user identity_url: Identity URL label_auth_type: Authentication type @@ -1097,12 +1138,15 @@ fi: new_user_heading: 'Sign up a new user:' new_user_title: TRACKS::Sign up no_signups_title: TRACKS::Ei rekisteröitymisiä - openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. - openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID. + openid_ok_pref_failed: You have successfully verified %{url} as your identity + but there was a problem saving your authentication preferences. + openid_url_verified: You have successfully verified %{url} as your identity and + set your authentication type to OpenID. password_confirmation_label: Confirm password password_updated: Password updated. register_with_cas: With your CAS username - select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. + select_authentication_type: Select your new authentication type and click 'Change + authentication type' to replace your current settings. signup: Signup signup_new_user: Sign up new user signup_successful: Signup successful for user %{username}. @@ -1119,11 +1163,11 @@ fi: next_label: Seuraava → page_entries_info: multi_page: Näytetään %{model} %{from} - %{to} yhtensä %{count} tietueesta - multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta + multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä + %{count} tietueesta single_page: - one: Näytetään 1 %{model} - other: Näytetään kaikki %{count} %{model} - zero: "%{model} ei löytynyt" + one: '%{model} ei löytynyt' + other: Näytetään 1 %{model} single_page_html: none: Näytetään 1 %{model} other: Näytetään kaikki %{count} %{model} From f78e9ca500db451f5d98e5fb0b70959a0ee74098 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 4 Jan 2021 12:16:35 +0100 Subject: [PATCH 253/767] =?UTF-8?q?Added=20translation=20using=20Weblate?= =?UTF-8?q?=20(Norwegian=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/nb_NO.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/locales/nb_NO.yml diff --git a/config/locales/nb_NO.yml b/config/locales/nb_NO.yml new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/config/locales/nb_NO.yml @@ -0,0 +1 @@ +{} From a8b5fa117e0e6fbf1a5c0b442e7e46d649d723f5 Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Mon, 4 Jan 2021 18:54:45 +0000 Subject: [PATCH 254/767] Translated using Weblate (German) Currently translated at 96.6% (937 of 969 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/de/ --- config/locales/de.yml | 249 +++++++++++++++++++++++++----------------- 1 file changed, 150 insertions(+), 99 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 03f03785..f330e643 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,4 +1,3 @@ ---- de: activerecord: attributes: @@ -43,7 +42,7 @@ de: user: auth_type: Auth type display_name: Display name - email: Email address + email: E-Mail-Adresse first_name: Vorname last_name: Nachname login: Login @@ -70,8 +69,8 @@ de: odd: muss ungerade sein record_invalid: 'Validation failed: %{errors}' restrict_dependent_destroy: - many: Невозможно удалить запись, так как есть %{record} зависящие от нее one: Невозможно удалить запись, так как есть %{record} зависящая от нее + other: Невозможно удалить запись, так как есть %{record} зависящие от нее taken: ist bereits vergeben too_long: ist zu lang (nicht mehr als %{count} Zeichen) too_short: ist zu kurz (nicht weniger als %{count} Zeichen) @@ -92,13 +91,12 @@ de: action: Aufgabe actions: Aufgaben actions_midsentence: - one: Aufgabe - other: Aufgaben - zero: Aufgaben + one: Aufgaben + other: Aufgabe add: Hinzufügen ajaxError: Fehler beim Empfangen vom Server back: Zurück - bugs: Bugs + bugs: Fehler cancel: Abbrechen collapse_expand: Collapse/expand context: Kontext @@ -106,9 +104,8 @@ de: contribute: Mitwirken create: Erstellen days_midsentence: - one: Tag - other: Tagen - zero: Tagen + one: Tagen + other: Tag deferred: aufgeschobene description: Beschreibung drag_handle: Verschieben @@ -120,16 +117,15 @@ de: go_back: Zurück last: Letzte logout: Abmelden - mailing_list: Mailing List + mailing_list: Mailingliste month: Monat months: Monate next: Nächste none: Keine not_available_abbr: n/b note: - one: 1 Notiz - other: "%{count} Notizen" - zero: keine Notizen + one: keine Notizen + other: 1 Notiz notes: Notizen numbered_step: Schritt %{number} ok: Ok @@ -145,11 +141,13 @@ de: show_all: Alle anzeigen sort: alphabetically: Alphabetisch - alphabetically_confirm: Sollen diese Projekte wirklich alphabetisch sortiert werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. + alphabetically_confirm: Sollen diese Projekte wirklich alphabetisch sortiert + werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. alphabetically_title: Projekte alphabetisch sortieren by_task_count: Nach Anzahl der Aufgaben by_task_count_title: Nach Anzahl der Aufgaben sortieren - by_task_count_title_confirm: Sollen diese Projekte wirklich nach Anzahl der Aufgaben sortiert werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. + by_task_count_title_confirm: Sollen diese Projekte wirklich nach Anzahl der + Aufgaben sortiert werden? Die bisherige Sortier-Reihenfolge wird damit überschrieben. sort: Sortieren third: Dritte todo: Aufgabe @@ -162,12 +160,13 @@ de: add_context: Kontext hinzufügen all_completed_tasks_title: TRACKS::Alle erledigten Aufgaben im Kontext '%{context_name}' completed_tasks_title: TRACKS::Erledigte Aufgaben im Kontext '%{context_name}' - context_deleted: Gelöschter Kontext '%{name}' + context_deleted: Gelöschter Kontext „%{name}“ context_hide: Auf Startseite ausblenden? context_name: Kontextname context_state: Context state delete_context: Kontext löschen - delete_context_confirmation: Soll der Kontext '%{name}' wirklich gelöscht werden? Alle (wiederkehrenden) Aufgaben dieses Kontexts werden hierdurch ebenfalls gelöscht. + delete_context_confirmation: Soll der Kontext '%{name}' wirklich gelöscht werden? + Alle (wiederkehrenden) Aufgaben dieses Kontexts werden hierdurch ebenfalls gelöscht. delete_context_title: Kontext löschen edit_context: Kontext bearbeiten hidden_contexts: Versteckte Kontexte @@ -265,28 +264,26 @@ de: other: fast %{count} Jahre half_a_minute: eine halbe Minute less_than_x_minutes: - one: weniger als eine Minute - other: weniger als %{count} Minuten - zero: weniger als 1 Minute + one: weniger als 1 Minute + other: weniger als eine Minute less_than_x_seconds: one: weniger als 1 Sekunde - other: weniger als %{count} Sekunden - zero: weniger als 1 Sekunde + other: weniger als 1 Sekunde over_x_years: one: mehr als 1 Jahr 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 @@ -319,7 +316,8 @@ de: too_long: 'слишком длинное (максимум: %{count} символов)' too_short: 'слишком кроткое (минимум: %{count} символов)' wrong_length: неверной длины (должно быть %{count} символов) - user_unauthorized: '401 Unauthorized: Nur administrative Benutzer dürfen auf diese Funktion zugreifen.' + user_unauthorized: '401 Unauthorized: Nur administrative Benutzer dürfen auf diese + Funktion zugreifen.' feedlist: actions_completed_last_week: In den letzten 7 Tagen erledigte Aufgaben actions_due_next_week: Nächste Woche fällige Aufgaben @@ -332,14 +330,17 @@ de: choose_context: Kontext für den Feed wählen choose_project: Projekt für den Feed wählen context_centric_actions: Feeds für unerledigte Aufgaben in einem bestimmten Kontext - context_needed: Es muss mindestens ein Kontext existieren, bevor ein Feed abonniert werden kann. + context_needed: Es muss mindestens ein Kontext existieren, bevor ein Feed abonniert + werden kann. ical_feed: iCal-Feed last_fixed_number: Die letzten %{number} Aufgaben legend: 'Legende:' - notice_incomplete_only: 'Hinweis: Alle Feeds zeigen nur Aufgaben, die noch nicht als erledigt markiert wurden.' + notice_incomplete_only: 'Hinweis: Alle Feeds zeigen nur Aufgaben, die noch nicht + als erledigt markiert wurden.' plain_text_feed: Reintext-Feed project_centric: Feeds für unerledigte Aufgaben in einem bestimmten Kontext - project_needed: Es muss mindestens ein Projekt existieren, bevor ein Feed abonniert werden kann. + project_needed: Es muss mindestens ein Projekt existieren, bevor ein Feed abonniert + werden kann. projects_and_actions: Aktive Projekte und deren Aufgaben rss_feed: RSS-Feed select_feed_for_context: Feed für diesen Kontext auswählen @@ -357,7 +358,7 @@ de: opensearch_description: In Tracks suchen layouts: mobile_navigation: - calendar: Calendar + calendar: Kalender contexts: Kontexte feeds: Feeds full: Full Site @@ -379,8 +380,8 @@ de: export_title: Daten importieren und exportieren feeds: Feeds feeds_title: Liste der verfügbaren Feeds anzeigen - group_view_by_context: Group by context - group_view_by_project: Group by project + group_view_by_context: Nach Kontext gruppieren + group_view_by_project: Nach Projekt gruppieren group_view_by_title: Change the grouping of the actions on this page help: "?" help_page: Help @@ -418,27 +419,30 @@ de: toggle_notes: Notizen umschalten 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}' + account_login: Kontoanmeldung + 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. - cas_signup_link: Account beantragen - cas_username_not_found: Sorry, aber es existiert kein Benutzer mit dem CAS-Benutzernamen (%{username}) + cas_no_user_found: Hallo, %{username}! Sie haben leider keinen Tracks-Konto. + cas_signup_link: Konto beantragen + cas_username_not_found: Sorry, aber es existiert kein Benutzer mit dem CAS-Benutzernamen + (%{username}) log_in_again: Erneut anmelden. logged_out: Sie wurden von Tracks abgemeldet. 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" - openid_identity_url_not_found: Sorry, aber es existiert kein Benutzer mit der Identitäts-URL (%{identity_url}) + openid_identity_url_not_found: Sorry, aber es existiert kein Benutzer mit der + Identitäts-URL (%{identity_url}) option_separator: oder, please_login: Bitte melde dich an, um Tracks zu nutzen session_time_out: Sitzung abgelaufen. Bitte %{link} session_will_expire: Sitzung wird nach %{hours} Stunde(n) der Inaktivität ablaufen. session_will_not_expire: Sitzung wird nicht ablaufen. sign_in: Anmeldung - signup_prompt: Want to create an account? + signup_prompt: Möchten Sie ein Konto erstellen? successful: Anmeldung erfolgreich. Willkommen zurück! successful_with_session_info: 'Anmeldung erfolgreich:' unsuccessful: Anmeldung war nicht erfolgreich. @@ -452,15 +456,17 @@ de: - Fällig am _______ themes: black: Black - light_blue: Light blue + light_blue: Hellblau project: feed_description: Listet alle Projekte für %{username} auf feed_title: Tracks-Projekte todo: error_date_must_be_future: muss ein Datum in der Zukunft sein user: - error_context_not_associated: Kontext-ID %{context} nicht mit Benutzer-ID %{user} verknüpft. - error_project_not_associated: Projekt-ID %{project} nicht mit User-ID %{user} verknüpft. + error_context_not_associated: Kontext-ID %{context} nicht mit Benutzer-ID %{user} + verknüpft. + error_project_not_associated: Projekt-ID %{project} nicht mit User-ID %{user} + verknüpft. notes: delete_confirmation: Sind Sie sicher, dass Sie die Notiz '%{id}' löschen möchten? delete_item_title: Eintrag löschen @@ -469,7 +475,8 @@ de: deleted_note: Notiz '%{id}' löschen edit_item_title: Eintrag bearbeiten in_project: 'In:' - no_notes_available: Derzeit gibt es keine Notizen. Füge Notizen auf der jeweiligen Projektseite hinzu. + no_notes_available: Derzeit gibt es keine Notizen. Füge Notizen auf der jeweiligen + Projektseite hinzu. note_header: Notiz %{id} note_link_title: Notiz %{id} anzeigen note_location_link: 'In:' @@ -487,7 +494,7 @@ de: unit: "€" format: delimiter: "." - precision: 2 + precision: '2' separator: "," significant: Significant strip_insignificant_zeros: Strip insignificant zeros @@ -503,7 +510,7 @@ de: unit: "." format: delimiter: Delimiter - precision: 1 + precision: '1' significant: 'true' strip_insignificant_zeros: 'true' storage_units: @@ -531,14 +538,18 @@ de: current_authentication_type: Dein Authentifizierungsart ist %{auth_type} edit_preferences: Einstellungen bearbeiten generate_new_token: Neues Token generieren - generate_new_token_confirm: Sind Sie sicher? Wenn Sie ein neues Token generieren, wird dies das alte Token ersetzen und jegliche externe Nutzung stören, die das alte Token verwendet. + generate_new_token_confirm: Sind Sie sicher? Wenn Sie ein neues Token generieren, + wird dies das alte Token ersetzen und jegliche externe Nutzung stören, die das + alte Token verwendet. is_false: Nein is_true: Ja open_id_url: 'Deine OpenID-URL lautet:' page_title: TRACKS::Einstellungen page_title_edit: TRACKS::Einstellungen ändern password_changed: Ihr Passwort geändert wurde, melden Sie sich bitte wieder an. - remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + remove_introduction: Hier können Sie Ihr Benutzerkonto löschen. Beachten Sie, + dass dies irreversibel ist und alle Ihre Daten entfernt! Nach dem Löschen werden + Sie abgemeldet. show_number_completed: Zeige %{number} erledigte Einträge sms_context_none: Keine staleness_starts_after: Abgestandenheit startet nach %{days} Tagen @@ -546,7 +557,7 @@ de: authentication: Authentifizierung date_and_time: Datum und Uhrzeit profile: Profil - remove_account: Remove account + remove_account: Konto löschen tracks_behavior: Tracks Verhalten title: Deine Einstellungen token_description: Token (für die Verwendung in Feeds und der API) @@ -590,7 +601,7 @@ de: notes: Notizen notes_empty: Es gibt keine Notizen für dieses Projekt page_title: 'TRACKS::Projekt: %{project}' - project_destroyed_status: Deleted project '%{name}' + project_destroyed_status: Projekt „%{name}“ gelöscht project_saved_status: Projekt gespeichert project_state: Projekt ist %{state} set_default_tags_notice: Standard-Tags des Projekts auf %{default_tags} setzen @@ -676,11 +687,14 @@ de: action_selection_title: TRACKS::Aufgabenauswahl actions: Aufgaben actions_30days_title: _Aufgaben der letzten 30 Tage - actions_actions_avg_created_30days: In den letzten 30 Tagen haben Sie durchschnittlich %{count} Aufgaben erstellt. + actions_actions_avg_created_30days: In den letzten 30 Tagen haben Sie durchschnittlich + %{count} Aufgaben erstellt. actions_avg_completed: und davon durchschnittlich %{count} per Monat erledigt. actions_avg_completed_30days: und durchschnittlich %{count} davon erledigt. - actions_avg_completion_time: Durchschnittlich haben Sie %{count} Tage gebraucht um eine Aufgabe zu erledigen. - actions_avg_created: In den letzten 12 Monaten haben Sie durchschnittlich %{count} Aufgaben erstellt + actions_avg_completion_time: Durchschnittlich haben Sie %{count} Tage gebraucht + um eine Aufgabe zu erledigen. + actions_avg_created: In den letzten 12 Monaten haben Sie durchschnittlich %{count} + Aufgaben erstellt actions_day_of_week_legend: day_of_week: Tag der Woche number_of_actions: Anzahl der Aufgaben @@ -696,14 +710,18 @@ de: number_of_actions: Anzahl Aufgaben actions_lastyear_title: Aufgaben der letzten 12 Monate actions_min_completion_time: Die minimale Zeit beträgt %{time}. - actions_min_max_completion_days: Das Minimum/Maximum in Tagen zur Erledigung ist %{min}/%{max}. + actions_min_max_completion_days: Das Minimum/Maximum in Tagen zur Erledigung ist + %{min}/%{max}. actions_selected_from_week: Aufgaben ausgewählt ab Woche click_to_return: Klick auf %{link} um zur Statistikseite zurückzukehren. click_to_return_link: hier - click_to_show_actions_from_week: Klick auf %{link} um die Aufgaben von Woche %{week} und danach anzuzeigen. - click_to_update_actions: Klicke auf eine Leiste in der Grafik um die Aufgaben unten zu aktualisieren. + click_to_show_actions_from_week: Klick auf %{link} um die Aufgaben von Woche %{week} + und danach anzuzeigen. + click_to_update_actions: Klicke auf eine Leiste in der Grafik um die Aufgaben + unten zu aktualisieren. contexts: Kontexte - current_running_time_of_incomplete_visible_actions: Aktuelle Laufzeit unerledigter sichtbarer Aufgaben + current_running_time_of_incomplete_visible_actions: Aktuelle Laufzeit unerledigter + sichtbarer Aufgaben index_title: TRACKS::Statistik labels: avg_completed: Durchschnittlich erledigt @@ -720,7 +738,8 @@ de: number_of_days: Anzahl vergangene Tage percentage: Prozentsatz running_time: Laufzeit einer Aufgabe (Wochen) - more_stats_will_appear: Weitere Statistiken werden verfügbar, wenn einige Aufgaben hinzugefügt wurden. + more_stats_will_appear: Weitere Statistiken werden verfügbar, wenn einige Aufgaben + hinzugefügt wurden. no_actions_selected: Es sind keine Aufgaben ausgewählt. no_tags_available: keine Tags verfügbar open_per_week: Aktiv (sichtbar und unsichtbar) nächsten Aufgaben pro Woche @@ -733,16 +752,21 @@ de: running_time_all_legend: actions: Aufgaben percentage: Prozentsatz - running_time: Laufzeit einer Aufgabe (Wochen). Klick auf eine Leiste für mehr Informationen. + running_time: Laufzeit einer Aufgabe (Wochen). Klick auf eine Leiste für mehr + Informationen. running_time_legend: actions: Aufgaben percentage: Prozentsatz - weeks: Vergangene Zeit einer Aufgabe (Wochen). Klicke auf eine Leiste für mehr Informationen. + weeks: Vergangene Zeit einer Aufgabe (Wochen). Klicke auf eine Leiste für mehr + Informationen. spread_of_actions_for_all_context: Aufgabenverteilung aller Kontexte - spread_of_running_actions_for_visible_contexts: Verteilung der laufenden Aufgaben aller sichtbaren Kontexte - tag_cloud_90days_description: Diese Tag-Cloud beinhaltet Tags der Aufgaben, die in den letzten 90 Tagen erstellt oder erledigt wurden. + spread_of_running_actions_for_visible_contexts: Verteilung der laufenden Aufgaben + aller sichtbaren Kontexte + tag_cloud_90days_description: Diese Tag-Cloud beinhaltet Tags der Aufgaben, die + in den letzten 90 Tagen erstellt oder erledigt wurden. tag_cloud_90days_title: Tag-Cloud-Aufgaben in den letzten 90 Tagen - tag_cloud_description: Diese Tag-Cloud beinhaltet Tags aller Aufgaben (erledigt, unerledigt, sichtbar, unsichtbar) + tag_cloud_description: Diese Tag-Cloud beinhaltet Tags aller Aufgaben (erledigt, + unerledigt, sichtbar, unsichtbar) tag_cloud_title: Tag-Cloud aller Aufgaben tags: Tags time_of_day: Tageszeit (alle Aufgaben) @@ -757,7 +781,8 @@ de: top10_projects: Top 10 aller Projekte top10_projects_30days: Top-10-Projekt der letzten 30 Tage top5_contexts: Top 5 aller Kontexte - top5_visible_contexts_with_incomplete_actions: Top 5 der sichtbaren Kontexte mit unerledigten Aufgaben + top5_visible_contexts_with_incomplete_actions: Top 5 der sichtbaren Kontexte mit + unerledigten Aufgaben totals: Ingesamt totals_action_count: hatten Sie insgesamt %{count} Aufgaben totals_actions_completed: "%{count} davon sind erledigt." @@ -797,8 +822,10 @@ de: 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_marked_complete: Die Aufgabe '%{description}' wurde als %{completed} markiert. - action_marked_complete_error: Die Aufgabe '%{description}' wurde aufgrund eines Fehlers NICHT als %{completed} markiert. + action_marked_complete: Die Aufgabe '%{description}' wurde als + %{completed} markiert. + action_marked_complete_error: Die Aufgabe '%{description}' wurde + aufgrund eines Fehlers NICHT als %{completed} markiert. action_saved: Aufgabe gespeichert action_saved_to_tickler: Aufgabe im Notizbuch gespeichert actions: @@ -836,7 +863,8 @@ de: due_today: Heute fällig get_in_ical_format: Diesen Kalender im iCal Format herunterladen calendar_page_title: TRACKS::Kalender - cannot_add_dependency_to_completed_todo: Kann keine Abhängigkeit zu einer erledigten Aufgabe hinzufügen! + cannot_add_dependency_to_completed_todo: Kann keine Abhängigkeit zu einer erledigten + Aufgabe hinzufügen! clear_due_date: Fälligkeitsdatum leeren clear_show_from_date: Datum leeren completed: Erledigt @@ -847,7 +875,8 @@ de: other: Es befinden sich %{count} erledigte Aufgaben im Archiv. completed_last_day: In den letzten 24 Stunden erledigt completed_last_x_days: In den letzten %{count} Tagen erledigt - completed_recurrence_completed: Es gibt keine weitere Aufgabe nach der soeben gelöschten. Die Wiederholung ist abgeschlossen. + completed_recurrence_completed: Es gibt keine weitere Aufgabe nach der soeben + gelöschten. Die Wiederholung ist abgeschlossen. completed_recurring: Erledigte wiederkehrende Aufgaben completed_recurring_actions_title: TRACKS::Erledigte wiederkehrende Aufgaben completed_rest_of_month: Erledigt diesen Monat @@ -856,19 +885,22 @@ 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_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 delete: Löschen delete_action: Aufgabe löschen - delete_recurring_action_confirm: Soll die wiederkehrende Aufgabe '%{description}' wirklich gelöscht werden? + delete_recurring_action_confirm: Soll die wiederkehrende Aufgabe '%{description}' + wirklich gelöscht werden? delete_recurring_action_title: Delete the recurring action deleted_success: Die Aufgabe wurde erfolgreich gelöscht. depends_on: Hängt ab von @@ -883,13 +915,17 @@ de: error: invalid_due_date: Invalid due date invalid_show_from_date: Invalid show from date - error_completing_todo: Beim Abschließen/Aktivieren der wiederkehrenden Aufgabe %{description} ist ein Fehler aufgetreten + error_completing_todo: Beim Abschließen/Aktivieren der wiederkehrenden Aufgabe + %{description} ist ein Fehler aufgetreten error_deleting_item: Beim Löschen von %{description} trat ein Fehler auf - error_deleting_recurring: Beim Löschen der wiederkehrenden Aufgabe %{description} ist ein Fehler aufgetreten + error_deleting_recurring: Beim Löschen der wiederkehrenden Aufgabe %{description} + ist ein Fehler aufgetreten error_removing_dependency: Beim Entfernen der Abhängigkeit ist ein Fehler aufgetreten - error_saving_recurring: Es gab einen Fehler beim Speichern der wiederkehrenden Aufgabe '%{description}' + error_saving_recurring: Es gab einen Fehler beim Speichern der wiederkehrenden + Aufgabe '%{description}' error_starring: Konnte die Hervorhebung von '%{description}' nicht durchführen - error_starring_recurring: Konnte die Hervorhebung der wiederkehrenden Aufgabe '%{description}' nicht durchführen + error_starring_recurring: Konnte die Hervorhebung der wiederkehrenden Aufgabe + '%{description}' nicht durchführen error_toggle_complete: Könnte nicht diese Marke todo komplett feed_title_in_context: im Kontext '%{context}' feed_title_in_project: im Projekt '%{project}' @@ -903,10 +939,12 @@ de: in_hidden_state: als versteckt markiert in_pending_state: und als ausstehend markiert list_incomplete_next_actions: Unerledigte Folge-Aufgaben anzeigen - list_incomplete_next_actions_with_limit: Zeige die letzten %{count} unerledigten Folge-Aufgaben + list_incomplete_next_actions_with_limit: Zeige die letzten %{count} unerledigten + Folge-Aufgaben mark_complete: Mark complete mobile_todos_page_title: Alle Aufgaben - new_related_todo_created: Eine neue Aufgabe wurde hinzugefügt, die zu dieser wiederkehrenden Aufgabe gehört + new_related_todo_created: Eine neue Aufgabe wurde hinzugefügt, die zu dieser wiederkehrenden + Aufgabe gehört new_related_todo_created_short: hat eine neue Aufgabe new_related_todo_not_created_short: konnte nicht erstellt werden next_action_description: Beschreibung der nächsten Aufgabe @@ -1035,9 +1073,11 @@ de: 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 mehr. Die Wiederholung endet hiermit. + recurrence_completed: Nach dieser erledigten wiederkehrenden Aufgabe folgt keine + mehr. Die Wiederholung endet hiermit. recurrence_period: Wiederholungszeitraum - recurring_action_deleted: Die Aufgabe wurde gelöscht. Da dies eine wiederkehrende Aufgabe ist, wurde eine neue erstellt. + recurring_action_deleted: Die Aufgabe wurde gelöscht. Da dies eine wiederkehrende + Aufgabe ist, wurde eine neue erstellt. recurring_action_saved: Wiederkehrende Aufgabe gespeichert recurring_actions_title: TRACKS::Wiederkehrende Aufgaben recurring_deleted_success: Die wiederkehrende Aufgabe wurde erfolgreich gelöscht. @@ -1061,32 +1101,41 @@ 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." + 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 + account_signup: Kontoerstellung approve_tos: I approve the Terms of Service auth_change_submit: Authentifizierungsart ändern - auth_type_update_error: 'Beim ändern der Authentifizierung trat ein Fehler auf: %{error_messages}' + auth_type_update_error: 'Beim ändern der Authentifizierung trat ein Fehler auf: + %{error_messages}' auth_type_updated: Authentifizierungs-Art erfolgreich geändert. change_auth_type_title: TRACKS::Authentifizierungstyp ändern change_authentication_type: Authentifizierungsart ändern - change_password_prompt: Gib dein neues Passwort in die unten stehenden Felder ein und klicke auf 'Passwort ändern' um dein altes Passwort durch das neue zu ersetzen. + change_password_prompt: Gib dein neues Passwort in die unten stehenden Felder + ein und klicke auf 'Passwort ändern' um dein altes Passwort durch das neue zu + ersetzen. change_password_submit: Passwort ändern change_password_title: TRACKS::Passwort ändern choose_password: Passwort wählen confirm_password: Passwort bestätigen desired_login: Gewünschter Benutzername - destroy_confirmation: 'Achtung: der Benutzer ''%{login}'' wird mit all seinen Aufgaben, Kontexten, Projekten und Notizen gelöscht. Sind Sie sicher, dass Sie fortfahren möchten?' + destroy_confirmation: 'Achtung: der Benutzer ''%{login}'' wird mit all seinen + Aufgaben, Kontexten, Projekten und Notizen gelöscht. Sind Sie sicher, dass Sie + fortfahren möchten?' destroy_error: Beim Löschen des Benutzers %{login} ist ein Fehler aufgetreten. destroy_successful: Benutzer %{login} wurde erfolgreich gelöscht destroy_user: Benutzer löschen - email_address: Email address + email_address: E-Mail-Adresse failed_to_delete_user: Löschen des Benutzers %{username} fehlgeschlagen - first_user_heading: 'Willkommen bei TRACKS. Als erstes legen Sie bitte einen Administrator-Zugang an:' + first_user_heading: 'Willkommen bei TRACKS. Als erstes legen Sie bitte einen Administrator-Zugang + an:' first_user_title: TRACKS::Sign up as the admin user identity_url: Identity-URL label_auth_type: Authentifizierungsart @@ -1096,12 +1145,15 @@ de: new_user_heading: 'Einen neuen Benutzer anlegen:' new_user_title: TRACKS::Als Administrator anmelden no_signups_title: TRACKS::Anmeldung nicht erlaubt - openid_ok_pref_failed: Die URL %{url} wurde erfolgreich als Identität verifiziert, beim Speichern der Einstellungen trat jedoch ein Fehler auf. - openid_url_verified: Die URL %{url} wurde erfolgreich als Identität verifiziert und Deine Authentifizierung auf OpenID umgestellt. + openid_ok_pref_failed: Die URL %{url} wurde erfolgreich als Identität verifiziert, + beim Speichern der Einstellungen trat jedoch ein Fehler auf. + openid_url_verified: Die URL %{url} wurde erfolgreich als Identität verifiziert + und Deine Authentifizierung auf OpenID umgestellt. password_confirmation_label: Passwort bestätigen password_updated: Passwort aktualisiert. register_with_cas: Mit deinem CAS-Benutzernamen - select_authentication_type: Wähle deine neue Authentifizierungsart und klicke 'Authentifizierungsart ändern' an, um deine aktuellen Einstellungen zu überschreiben. + select_authentication_type: Wähle deine neue Authentifizierungsart und klicke + 'Authentifizierungsart ändern' an, um deine aktuellen Einstellungen zu überschreiben. signup: Registrieren signup_new_user: Neuen Benutzer anlegen signup_successful: Benutzer %{username} erfolgreich angelegt. @@ -1118,14 +1170,13 @@ de: next_label: Nächste » page_entries_info: multi_page: Angezeigte %{model} %{from} - %{to} von %{count} insgesamt - multi_page_html: Angezeigte %{model} %{from} - %{to} von %{count} insgesamt + multi_page_html: Angezeigte %{model} %{from} - %{to} von %{count} + insgesamt single_page: - one: Angezeigte 1 %{model} - other: Anzeige aller %{count} %{model} - zero: Kein %{model} gefunden + one: Kein %{model} gefunden + other: Angezeigte 1 %{model} single_page_html: - one: Angezeigte 1 %{model} - other: Anzeige aller %{count} %{model} - zero: Kein %{model} gefunden + one: Kein %{model} gefunden + other: Angezeigte 1 %{model} page_gap: "..." previous_label: "« Zurück" From 41d63f7790dcea8f513d9fce6c7b9ead0b8db6cd Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Mon, 4 Jan 2021 19:00:48 +0000 Subject: [PATCH 255/767] Translated using Weblate (French) Currently translated at 100.0% (969 of 969 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fr/ --- config/locales/fr.yml | 408 ++++++++++++++++++++++++------------------ 1 file changed, 232 insertions(+), 176 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e67648d8..9ff66c5b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,4 +1,3 @@ ---- fr: activerecord: attributes: @@ -14,13 +13,16 @@ fr: mobile_todos_per_page: Actions par page (vue mobile) refresh: Intervalle de rafraîchissement (en minutes) review_period: Intervalle de revue de projet - show_completed_projects_in_sidebar: Montrer les projets complétés dans le panneau latéral - show_hidden_contexts_in_sidebar: Montrer les contextes cachés dans le panneau latéral - show_hidden_projects_in_sidebar: Montrer les projets cachés dans le panneau latéral + show_completed_projects_in_sidebar: Montrer les projets complétés dans le + panneau latéral + show_hidden_contexts_in_sidebar: Montrer les contextes cachés dans le panneau + latéral + show_hidden_projects_in_sidebar: Montrer les projets cachés dans le panneau + latéral show_number_completed: Montrer le nombre d'actions complétées show_project_on_todo_done: Aller au projet quand la tâche est terminée - sms_context: Contexte email par défaut - sms_email: De l'email + sms_context: Contexte courriel par défaut + sms_email: Du courriel staleness_starts: Début de dépassement time_zone: Fuseau horaire title_date_format: Format de la date en entête @@ -42,12 +44,12 @@ fr: tags: Étiquettes user: auth_type: Auth type - display_name: Display name - email: Email address + display_name: Nom d'affichage + email: Adresse courriel first_name: Prénom last_name: Nom login: Login - open_id_url: OpenID URL + open_id_url: URL OpenID password: Password errors: full_messages: @@ -59,7 +61,7 @@ fr: empty: ne peut être vide equal_to: doit être égal à %{count} even: doit être pair - exclusion: exclusion? + exclusion: est réservé greater_than: doit être plus grand que %{count} greater_than_or_equal_to: doit être plus grand ou égal à %{count} inclusion: n'appartient pas à la liste @@ -70,8 +72,8 @@ fr: odd: doit être impair record_invalid: 'La validation a échoué : %{errors}' restrict_dependent_destroy: - many: Невозможно удалить запись, так как есть %{record} зависящие от нее one: Невозможно удалить запись, так как есть %{record} зависящая от нее + other: Невозможно удалить запись, так как есть %{record} зависящие от нее taken: est déjà pris too_long: est trop long (maximum de %{count} caractères) too_short: est trop court (minimum de %{count} charactères) @@ -92,13 +94,12 @@ fr: action: Action actions: Actions actions_midsentence: - one: action - other: actions - zero: actions + one: actions + other: action add: Ajouter ajaxError: Une erreur s'est produite en accédant un serveur back: Retour - bugs: Bugs + bugs: Erreurs cancel: Annuler collapse_expand: Réduire/maximiser context: Contexte @@ -106,13 +107,12 @@ fr: contribute: Contribuer create: Créer days_midsentence: - one: jour - other: jours - zero: jours + one: jours + other: jour deferred: reportées description: Description drag_handle: DRAG - email: email + email: Courriel errors_with_fields: 'Il y a des problèmes avec les champs suivants :' first: Premier forth: FORTH @@ -120,16 +120,15 @@ fr: go_back: Retour last: Dernier logout: Déconnexion - mailing_list: Mailing List + mailing_list: Liste de diffusion month: mois months: Mois next: Suivant none: Aucun not_available_abbr: n/a note: - one: 1 note - other: "%{count} notes" - zero: non notes + one: non notes + other: 1 note notes: Notes numbered_step: Étape %{number} ok: OK @@ -141,15 +140,17 @@ fr: review: Revue search: Rechercher second: Seconde - server_error: Une erreur s'est produite sur le serveur + server_error: Une erreur s'est produite sur le serveur. 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,12 +163,13 @@ fr: add_context: Ajouter un contexte all_completed_tasks_title: TRACKS::Toutes les actions achevées du contexte «?%{context_name}?» completed_tasks_title: TRACKS::actions achevées du contexte «?%{context_name}?» - context_deleted: Contexte «?%{name}?» supprimé + context_deleted: Contexte supprimé « %{name} » context_hide: Caché de la première page ? context_name: Nom du Contexte - context_state: Context state + context_state: État 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·e 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 @@ -175,10 +177,10 @@ fr: 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_pre: Le contexte «? - no_contexts_: 'No contexts ' + new_context_pre: Nouveau contexte ' + no_contexts_: 'Aucun contexte ' no_contexts_active: Actuellement, il n'y a pas de contextes actifs - no_contexts_closed: Currently there are no closed contexts + no_contexts_closed: Actuellement, il n'y a pas de contextes fermés no_contexts_hidden: Actuellement, il n'y a pas de contextes cachés save_status_message: Contexte sauvegardé show_form: Créer un nouveau contexte @@ -189,10 +191,10 @@ fr: update_status_message: Le nom du contexte a été modifié visible_contexts: Contextes visibles data: - import_destination_invalid: Invalid import destination - import_errors: Des erreurs se sont produites durant l'importation. + import_destination_invalid: Destination d'importation non valide + import_errors: Certaines erreurs se sont produites lors de l'importation import_successful: L'import a réussi. - invalid_import_destination: Invalid import destination + invalid_import_destination: Destination d'importation invalide date: abbr_day_names: - dim @@ -266,63 +268,62 @@ fr: half_a_minute: 30 secondes less_than_x_minutes: one: moins d'1 minute - other: moins de %{count} minutes - zero: moins d'1 minute + other: moins d'une minute less_than_x_seconds: one: moins d'1 seconde - other: moins de %{count} secondes - zero: moins d'1 seconde + other: moins d'1 seconde over_x_years: one: plus d'1 an 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 minute: Minute month: Mois - second: Seconde + second: Secondes year: Année errors: format: "%{attribute} %{message}" messages: - accepted: должен быть подтвержден + accepted: doit être accepté blank: ne peut pas être absent - confirmation: не соответствует %{attribute} + confirmation: ne correspond pas à %{attribute} empty: ne peut pas être vide equal_to: doit être égal à %{count} even: doit être pair exclusion: est réservé greater_than: doit être supérieur à %{count} greater_than_or_equal_to: doit être supérieur ou égal à %{count} - inclusion: не входит в список + inclusion: n'est pas inclus dans la liste invalid: est invalide less_than: doit être inférieur à %{count} less_than_or_equal_to: doit être inférieur ou égal à %{count} not_a_number: n'est pas un nombre not_an_integer: doit être un entier odd: doit être impair - other_than: должно отличаться от %{count} - present: должно быть пустым - taken: уже занято - too_long: est trop long (%{count} caractères maximum) - too_short: est trop court (%{count} caractères minimum) - wrong_length: неверной длины (должно быть %{count} символов) + other_than: doit être autre que %{count} + present: doit être absent + taken: a déjà été pris + too_long: est trop long (le maximum est de %{count} caractères) + too_short: est trop court (le minimum est de %{count} caractères) + wrong_length: est de la mauvaise longueur (doit contenir %{count} caractères) user_unauthorized: '401 Non autorisé : Administrateur seulement.' feedlist: actions_completed_last_week: Actions réalisées dans les 7 derniers jours - actions_due_next_week: Actions devant se terminer dans les 7 prochains jours ou moins + actions_due_next_week: Actions devant se terminer dans les 7 prochains jours ou + moins actions_due_today: Actions devant se terminer aujourd'hui ou avant active_projects_wo_next: Projets actifs sans action suivante active_starred_actions: Toutes les actions préferrées actives @@ -335,8 +336,9 @@ fr: context_needed: Il faut au moins un contexte pour le flux ical_feed: Flux iCal last_fixed_number: Dernières %{number} actions - legend: Légende - notice_incomplete_only: 'N.B. : Les flux ne montrent que les actions incomplètes, sauf indication contraire' + legend: 'Légende :' + notice_incomplete_only: 'N.B. : Les flux ne montrent que les actions incomplètes, + sauf indication contraire' plain_text_feed: Flux texte project_centric: Flux des actions incomplètes d'un projet spécifique project_needed: Il faut au moins un projet pour le flux @@ -348,7 +350,7 @@ fr: send_feedback: Envoyer un feedback sur %{version} helpers: select: - prompt: Sélectionnez + prompt: Veuillez sélectionner submit: create: Créer %{model} submit: Sauvegarder %{model} @@ -357,7 +359,7 @@ fr: opensearch_description: Rechercher dans Tracks layouts: mobile_navigation: - calendar: Calendar + calendar: Calendrier contexts: Contextes feeds: Flux full: Site en version complète @@ -379,9 +381,9 @@ fr: export_title: Importer et exporter des données feeds: Flux feeds_title: Voir une liste des flux disponibles - group_view_by_context: Group by context - group_view_by_project: Group by project - group_view_by_title: Change the grouping of the actions on this page + group_view_by_context: Regrouper par contexte + group_view_by_project: Grouper par projet + group_view_by_title: Changer le regroupement des actions sur cette page help: "?" help_page: Help home: Accueil @@ -402,9 +404,9 @@ fr: recurring_todos_title: Gerer les actions récurrentes review_title: Faire examiner search: Recherches tous les items - show_empty_containers_context: Show empty contexts - show_empty_containers_project: Show empty projects - show_empty_containers_title: Show or hide the empty projects or contexts + show_empty_containers_context: Afficher les contextes vides + show_empty_containers_project: Afficher les projets vides + show_empty_containers_title: Afficher ou masquer les projets ou contextes vides starred: Favoris starred_title: Voir vos actions préférées stats: Statistiques @@ -422,23 +424,24 @@ fr: cas_create_account: Si vous voulez vous inscrire aller à %{signup_link} cas_logged_in_greeting: Bonjour, %{username} ! Vous êtes authentifié. cas_login: Login CAS - cas_no_user_found: Bonjour, %{username} ! Vous n'avez pas de compte sur Tracks. + cas_no_user_found: Bonjour, %{username} ! Vous n'avez pas de compte sur Tracks. cas_signup_link: Demander un compte cas_username_not_found: Désolé, aucun utilisateur avec ce nom CAS n'existe (%{username}) - log_in_again: Se reconnecter + log_in_again: se reconnecter. logged_out: Vous avez été déconnecté de Tracks. 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" - openid_identity_url_not_found: Désolé, aucun utilisateur avec cette identité URL n'existe (%{identity_url}) + openid_identity_url_not_found: Désolé, aucun utilisateur avec cette identité URL + n'existe (%{identity_url}) option_separator: ou, please_login: Veuillez vous connecter pour utiliser Tracks session_time_out: La session a expiré. Merci de %{link} session_will_expire: la session expire après %{hours} heure(s) d'inactivité. session_will_not_expire: la session n'expire jamais. sign_in: Se connecter - signup_prompt: Want to create an account? + signup_prompt: Voulez-vous créer un compte ? successful: La connexion a réussi. Bienvenue ! successful_with_session_info: 'La connexion a réussi :' unsuccessful: La connexion a échoué. @@ -452,15 +455,17 @@ fr: - Échéance le ____ themes: black: Black - light_blue: Light blue + light_blue: Bleu clair project: feed_description: Liste de tous les projets de %{username} feed_title: Projets Tracks todo: error_date_must_be_future: doit être une date dans le futur user: - error_context_not_associated: L'identifiant contexte %{context} n'est pas associé à l'identifiant utilisateur %{user}. - error_project_not_associated: Project id %{project} not associated with user id %{user}. + error_context_not_associated: L'identifiant contexte %{context} n'est pas associé + à l'identifiant utilisateur %{user}. + error_project_not_associated: L'identifiant de projet %{project} n'est pas associé + à l'identifiant utilisateur %{user}. notes: delete_confirmation: Êtes-vous sur de vouloir supprimer la note «?%{id}?» ? delete_item_title: Supprimer l'élément @@ -468,44 +473,45 @@ fr: delete_note_title: Supprimer la note «?%{id}?» deleted_note: Supprimer la note «?%{id}?» edit_item_title: Modifier l'élément - in_project: 'Dans :' - no_notes_available: 'Il n''y a actuellement aucune note : ajouter des notes aux projets sur les pages individuelles des projets.' + in_project: 'Dans : ' + no_notes_available: 'Il n''y a actuellement aucune note : ajouter des notes aux + projets sur les pages individuelles des projets.' note_header: Note %{id} note_link_title: Voir note %{id} - note_location_link: 'ln:' - save_status_message: Note %{id} was saved + note_location_link: 'Dans :' + save_status_message: La note %{id} a été enregistrée show_note_title: Voir note number: currency: format: delimiter: "," format: "%u%n" - precision: 2 + precision: '2' separator: "." - significant: false - strip_insignificant_zeros: false + significant: 'False' + strip_insignificant_zeros: 'False' unit: "$" format: delimiter: "," - precision: 2 + precision: '2' separator: "." - significant: false - strip_insignificant_zeros: false + significant: 'False' + strip_insignificant_zeros: 'False' human: decimal_units: format: "%n %u" units: - billion: Миллиард - million: Миллион - quadrillion: Квадрильон - thousand: Тысяча - trillion: Триллион + billion: Milliard + million: Million + quadrillion: Billiard + thousand: Mille + trillion: Billion unit: "." format: delimiter: Delimiter - precision: 1 - significant: true - strip_insignificant_zeros: true + precision: '1' + significant: 'True' + strip_insignificant_zeros: 'True' storage_units: format: "%n %u" units: @@ -531,14 +537,18 @@ fr: current_authentication_type: Votre type d'authentification est %{auth_type} 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 page_title: TRACKS::Préférences page_title_edit: TRACKS::Éditer les préférences - password_changed: Votre mot de passe a été changé, s'il vous plaît vous connecter à nouveau. - remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + password_changed: Votre mot de passe a été changé, s'il vous plaît vous connecter + à nouveau. + remove_introduction: Vous pouvez supprimer votre compte utilisateur ici. Notez + que ceci est irréversible et supprimera toutes vos données ! Après la suppression, + vous serez déconnecté·e. 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' @@ -546,7 +556,7 @@ fr: authentication: Authentification date_and_time: Date et heure profile: Profil - remove_account: Remove account + remove_account: Supprimer le compte tracks_behavior: Comportements Tracks title: Vos préférences token_description: Jeton (pour flux et utilisation API) @@ -559,16 +569,16 @@ fr: add_note_submit: Ajouter note add_project: Ajouter projet all_completed_tasks_title: TRACKS::Tous les actions achevées en Projet '%{project_name}' - completed_actions: Completed actions - completed_actions_empty: Completed actions empty + completed_actions: Actions terminées + completed_actions_empty: Actions terminées vides completed_projects: Projets réalisés completed_tasks_title: TRACKS::Liste des actions menées à terme dans Projet '%{project_name}' default_context: Le contexte par défaut pour ce projet est %{context} default_context_removed: Contexte par défaut supprimé default_context_set: Définir le contexte par défaut du projet à %{default_context} default_tags_removed_notice: Supprimer les étiquettes par défaut - deferred_actions: Deferred actions - deferred_actions_empty: Deferred actions empty + deferred_actions: Actions différées + deferred_actions_empty: Actions différées vides delete_project: Supprimer projet delete_project_confirmation: Êtes-vous sûr de vouloir supprimer le projet «?%{name}?» ? delete_project_title: Supprimer le projet @@ -578,7 +588,7 @@ fr: hide_form: Cacher le formulaire hide_form_title: Cacher le formulaire nouveau projet is_active: est actif - last_completed_in_project: "(last %{number})" + last_completed_in_project: "(dernier %{number})" list_completed_projects: TRACKS::Liste des projets achevés list_projects: TRACKS::Liste des projets list_reviews: TRACKS::Revue @@ -590,9 +600,9 @@ fr: notes: Notes notes_empty: Il n'y a pas de notes pour ce projet page_title: 'TRACKS::Projet : %{project}' - project_destroyed_status: Deleted project '%{name}' + project_destroyed_status: Projet « %{name} » supprimé project_saved_status: Projet sauvegardé - project_state: Le projet est %{state} + project_state: Le projet est %{state}. set_default_tags_notice: Définir les étiquettes par défaut du projet à %{default_tags} settings: Paramètres show_form: Ajouter un projet @@ -604,7 +614,7 @@ fr: was_marked_complete: est complété was_marked_hidden: est caché with_default_context: avec '%{context_name}' comme contexte par défaut - with_default_tags: and with '%{tags}' as the default tags + with_default_tags: et avec « %{tags} » comme étiquettes par défaut with_no_default_context: sans contexte par défaut with_no_default_tags: et sans étiquettes par défaut search: @@ -642,8 +652,8 @@ fr: active_plural: Actifs blocked: Bloquée blocked_plural: Bloquée - close: Closed - closed_plural: Closed + close: Fermé + closed_plural: Fermé completed: Completé completed_plural: Completés contexts: @@ -651,18 +661,18 @@ fr: active: Contextes actifs closed: Contextes fermés hidden: Contextes cachés - current: Up-to-date - current_plural: Up-to-date + current: À jour + current_plural: À jour hidden: Caché hidden_plural: Cachés projects: ":": ":" - active: Active projects - blocked: Blocked - closed: Closed projects - completed: Completed - current: Current - hidden: Hidden projects + active: Projets actifs + blocked: Bloqué + closed: Projets fermés + completed: Terminé + current: Actuel + hidden: Projets cachés review: Review stalled: Stalled review: Datée @@ -676,11 +686,14 @@ fr: action_selection_title: TRACKS::Selection action actions: Actions actions_30days_title: Actions des 30 derniers jours - actions_actions_avg_created_30days: Dans les 30 jours vous avez créer en moyenne %{count} actions + actions_actions_avg_created_30days: Dans les 30 jours vous avez créer en moyenne + %{count} actions actions_avg_completed: et réalisé une moyenne de %{count} actions par mois. actions_avg_completed_30days: et réalisé une moyenne de %{count} actions par jour. - actions_avg_completion_time: Pour toutes vos actions réalisés, le temps moyen de réalisation est %{count} jours. - actions_avg_created: Dans les 12 derniers mois vous avez créé une moyenne de %{count} actions + actions_avg_completion_time: Pour toutes vos actions réalisés, le temps moyen + de réalisation est %{count} jours. + actions_avg_created: Dans les 12 derniers mois vous avez créé une moyenne de %{count} + actions actions_day_of_week_legend: day_of_week: Jour de la semaine number_of_actions: Certain nombre d'actions @@ -689,21 +702,25 @@ fr: day_of_week: Jour de la semaine number_of_actions: Certain nombre d'actions actions_dow_30days_title: Jour de la semaine (les 30 derniers jours) - actions_further: et plus + actions_further: ' et plus' actions_last_year: Actions des dernières années actions_last_year_legend: months_ago: Mois précédents number_of_actions: Nombre d'actions actions_lastyear_title: Actions des 12 derniers mois actions_min_completion_time: Le temps minimum de réalisation est %{time}. - actions_min_max_completion_days: Le nombre min/max de jours pour réaliser est %{min}/%{max}. - actions_selected_from_week: Actions selectionnées depuis la semaine - click_to_return: Cliquer %{link} pour revenir à la page des statistiques + actions_min_max_completion_days: Le nombre min/max de jours pour réaliser est + %{min}/%{max}. + actions_selected_from_week: 'Actions selectionnées depuis la semaine ' + click_to_return: Cliquer %{link} pour revenir à la page des statistiques. click_to_return_link: ici - click_to_show_actions_from_week: Cliquer %{link} pour voir les actions depuis la semaine %{week}. - click_to_update_actions: Cliquer sur une barre du graphique pour mettre a jour les actions ci-dessous. + click_to_show_actions_from_week: Cliquer %{link} pour voir les actions depuis + la semaine %{week}. + click_to_update_actions: Cliquer sur une barre du graphique pour mettre a jour + les actions ci-dessous. contexts: Contextes - current_running_time_of_incomplete_visible_actions: Durée en cours des actions incomplètes visibles + current_running_time_of_incomplete_visible_actions: Durée en cours des actions + incomplètes visibles index_title: TRACKS::Statistiques labels: avg_completed: Moy. Réalisé @@ -720,7 +737,8 @@ fr: number_of_days: Il y a ... jours percentage: Pourcentage running_time: Temps en cours d'une action (en semaines) - more_stats_will_appear: Plus de statistiques apparaitront quand vous aurez ajouter quelques actions. + more_stats_will_appear: Plus de statistiques apparaitront quand vous aurez ajouter + quelques actions. no_actions_selected: Il n'y a pas d'actions sélectionnées. no_tags_available: pas d'étiquettes disponibles open_per_week: Actifs (visibles et cachés) prochaines actions par semaine @@ -733,16 +751,21 @@ fr: running_time_all_legend: actions: Actions percentage: Pourcentage - running_time: Temps en cours d'une action (en semaines). Cliquer sur une barre pour plus d'info + running_time: Temps en cours d'une action (en semaines). Cliquer sur une barre + pour plus d'info running_time_legend: actions: Actions percentage: Pourcentage - weeks: Temps en cours d'une action (en semaines). Cliquer sur une barre pour plus d'info + weeks: Temps en cours d'une action (en semaines). Cliquer sur une barre pour + plus d'info spread_of_actions_for_all_context: Vue des actions pour tous les contextes - spread_of_running_actions_for_visible_contexts: Vue des actions en cours pour tous les contextes - tag_cloud_90days_description: Nuage d'étiquettes correspondant aux actions créées ou réalisées lors des 90 derniers jours. + spread_of_running_actions_for_visible_contexts: Vue des actions en cours pour + 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_description: Nuage d'étiquettes correspondant à la totalité des actions (réalisées, en cours, visibles ou cachées). + 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 time_of_day: Heure (toutes les actions) @@ -757,12 +780,13 @@ fr: top10_projects: Top 10 des projets top10_projects_30days: Top 10 des projets (30 derniers jours) top5_contexts: Top 5 des contextes - top5_visible_contexts_with_incomplete_actions: Top 5 des contextes visibles avec des actions en cours + top5_visible_contexts_with_incomplete_actions: Top 5 des contextes visibles avec + des actions en cours totals: Totaux 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 @@ -770,16 +794,16 @@ fr: totals_hidden_context_count: et %{count} sont des contextes 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_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" within_one: Moins de 1 support: array: - last_word_connector: ", et" - two_words_connector: et - words_connector: "," + last_word_connector: "et " + two_words_connector: ' et ' + words_connector: ", " select: prompt: Veuillez sélectionner time: @@ -797,8 +821,10 @@ fr: 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_marked_complete: L'action '%{description}' a été marquée comme %{completed} - action_marked_complete_error: L'action '%{description}' n'a PAS été marquée comme %{completed} a cause d'une erreur sur le serveur + action_marked_complete: L'action '%{description}' a été marquée + comme %{completed} + action_marked_complete_error: L'action '%{description}' n'a PAS + été marquée comme %{completed} a cause d'une erreur sur le serveur action_saved: Action sauvegardée action_saved_to_tickler: Action sauvegardée dans l'échéancier actions: @@ -816,7 +842,7 @@ fr: tag_hidden: Hidden actions tagged with '%{param}' 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 @@ -824,7 +850,8 @@ fr: added_new_project: Nouveau projet ajouté all_completed: Toutes les actions réalisées all_completed_here: ici - all_completed_tagged_page_title: TRACKS::Toutes les tâches accomplies par marquer %{tag_name} + all_completed_tagged_page_title: TRACKS::Toutes les tâches accomplies par marquer + %{tag_name} append_in_this_project: dans ce projet archived_tasks_title: TRACKS::Tâches réalisées archivées blocked_by: Bloqué par %{predecessors} @@ -836,18 +863,20 @@ fr: 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 tant que dépendance d'une action complétée ! + cannot_add_dependency_to_completed_todo: Impossible d'ajouter cette action en + tant que dépendance d'une action complétée ! clear_due_date: Effacer la date d'échéance clear_show_from_date: Effacer show from date completed: Complété completed_actions: Completed actions completed_actions_with: Action complétées avec l'étiquette %{tag_name} completed_in_archive: - one: Il n'y a pas d'action complétée dans l'archive - other: Il y a %{count} actions complétées dans l'archive + one: Il n'y a pas d'action complétée dans l'archive. + other: Il y a %{count} actions complétées dans l'archive. completed_last_day: Complété ces dernières 24 heures completed_last_x_days: Complété ces %{count} jours - completed_recurrence_completed: Il n'y pas d'action suivante après l'action récurrente que vous avez supprimée. La récurrence est terminée + completed_recurrence_completed: Il n'y pas d'action suivante après l'action récurrente + que vous avez supprimée. La récurrence est terminée completed_recurring: Tâches reccurents complétés completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Complété dans le reste de ce mois-ci @@ -859,7 +888,8 @@ fr: 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 ajuster la date d'écheance avant de reporter. + defer_date_after_due_date: La date de report est après la date d'échéance. Veuillez + ajuster la date d'écheance avant de reporter. defer_x_days: one: Reporter d'1 jour other: Report de %{count} jours @@ -868,13 +898,15 @@ fr: deferred_tasks_title: TRACKS::Échéancier delete: Supprimer delete_action: Supprimer action - delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'? + delete_recurring_action_confirm: Êtes-vous sûr·e de vouloir supprimer l'action + récurrente « % {description} » ? delete_recurring_action_title: Supprimer l'action récurrente deleted_success: Action supprimée avec succès. depends_on: Dépend de depends_on_separate_with_commas: Dépend de (séparer avec des virgules) done: Terminé ? - drag_action_title: Déplacer sur une autre action pour la rendre dépendante de cette action + drag_action_title: Déplacer sur une autre action pour la rendre dépendante de + cette action. due: Échéance edit: Modifier edit_action: Modifier action @@ -883,13 +915,19 @@ fr: error: invalid_due_date: Invalid due date invalid_show_from_date: Invalid show from date - error_completing_todo: Il s'est produit une erreur lors de l'execution de l'action récurrente %{description} - error_deleting_item: Il s'est produit une erreur lors de la suppression de l'élément %{description} - error_deleting_recurring: Il s'est produit une erreur lors de la suppression de la tâche récurrente '%{description}' - error_removing_dependency: Il s'est produit une erreur lors de la suppression de la dépendance - error_saving_recurring: Il s'est produit une erreur lors de la sauvegarde de la tâche récurrente '%{description}' + error_completing_todo: Il s'est produit une erreur lors de l'execution de l'action + récurrente %{description} + error_deleting_item: Il s'est produit une erreur lors de la suppression de l'élément + %{description} + error_deleting_recurring: Il s'est produit une erreur lors de la suppression de + la tâche récurrente '%{description}' + error_removing_dependency: Il s'est produit une erreur lors de la suppression + de la dépendance + error_saving_recurring: Il s'est produit une erreur lors de la sauvegarde de la + tâche récurrente '%{description}' error_starring: Impossible d'actionner l'étoile de cette tache '%{description}' - error_starring_recurring: Impossible d'actionner l'étoile de la tache récurrente '%{description}' + error_starring_recurring: Impossible d'actionner l'étoile de la tache récurrente + '%{description}' error_toggle_complete: Impossible de marquer cette tache comme complétée feed_title_in_context: dans le contexte '%{context}' feed_title_in_project: dans le projet '%{project}' @@ -903,10 +941,12 @@ fr: in_hidden_state: a l'état caché in_pending_state: en attente list_incomplete_next_actions: Liste les prochaines actions incomplètes - list_incomplete_next_actions_with_limit: Liste les %{count} dernières actions suivantes incomplètes + list_incomplete_next_actions_with_limit: Liste les %{count} dernières actions + suivantes incomplètes mark_complete: Mark complete 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: 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_not_created_short: n'a pas créé la tâche next_action_description: Description de la prochaine action @@ -1035,16 +1075,18 @@ fr: yearly_every_x_day: Chaque %{month} %{day} yearly_every_xth_day: Chaque %{day} %{day_of_week} de %{month} yearly_options: Paramètres pour les actions récurrentes annuelles - recurrence_completed: Il n'y a pas d'action suivante après l'action récurrente que vous venez de terminer. Fin de la récurrence + recurrence_completed: Il n'y a pas d'action suivante après l'action récurrente + que vous venez de terminer. Fin de la récurrence recurrence_period: Periode de récurrence - recurring_action_deleted: L'action a été supprimée. Parce que cette action est récurrente, une nouvelle action à été ajoutée + recurring_action_deleted: L'action a été supprimée. Parce que cette action est + récurrente, une nouvelle action à été ajoutée recurring_action_saved: Action récurrente sauvée recurring_actions_title: TRACKS::Actions récurrentes recurring_deleted_success: L'action récurrente a été supprimée avec succès. recurring_pattern_removed: La périodicité est retiré de %{count} recurring_todos: Tâches récurrentes remove_dependency: Enlever les dépendances (l'action n'est pas supprimée) - removed_predecessor: Suppression de %{successor} comme dépendance de %{predecessor} + 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" @@ -1060,33 +1102,43 @@ fr: 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." + 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." 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 pas à une action existante. Cette valeur ne sera pas sauvegardée avec le reste de l'action. Continuer ? + unresolved_dependency: La valeur saisie dans le champ dépendance ne correspond + pas à une action existante. Cette valeur ne sera pas sauvegardée avec le reste + de l'action. Continuer ? was_due_on_date: arrivée à échéance le %{date} users: account_signup: Créer un compte approve_tos: I approve the Terms of Service auth_change_submit: Modifier le type d'authenfication - auth_type_update_error: 'Un problème est survenu lors de la modification du type d''authentification : %{error_messages}' + auth_type_update_error: 'Un problème est survenu lors de la modification du type + d''authentification : %{error_messages}' auth_type_updated: Type d'authentification modifié. change_auth_type_title: TRACKS::Modifier le type d'authentification change_authentication_type: Modifier le type d'authentification - change_password_prompt: Entrez votre nouveau mot de passe dans les champs ci-dessous et cliquez sur «?Modifier mot de passe?» pour remplacer votre mot de passe actuel par le nouveau. + change_password_prompt: Entrez votre nouveau mot de passe dans les champs ci-dessous + et cliquez sur «?Modifier mot de passe?» pour remplacer votre mot de passe actuel + par le nouveau. change_password_submit: Modifier mot de passe change_password_title: TRACKS::Modifier mot de passe choose_password: Choisir le mot de passe confirm_password: Confirmer le mot de passe desired_login: Login souhaité - destroy_confirmation: 'Attention : cela va supprimer l''utilisateur ''%{login}'', toutes ses actions, contextes, projets et notes. Êtes-vous sûr de vouloir continuer ?' - destroy_error: Une erreur s'est produite lors de la suppression de l'utilisateur %{login} + destroy_confirmation: 'Attention : cela va supprimer l''utilisateur ''%{login}'', + toutes ses actions, contextes, projets et notes. Êtes-vous sûr de vouloir continuer ?' + destroy_error: Une erreur s'est produite lors de la suppression de l'utilisateur + %{login} destroy_successful: Utilisateur %{login} supprimé avec succès destroy_user: Supprimer utilisateur - email_address: Email address + email_address: Adresse courriel failed_to_delete_user: La suppression de l'utilisateur %{username} a échoué - first_user_heading: Bienvenue dans TRACKS. Pour commencer, veuillez créer un compte administrateur + first_user_heading: 'Bienvenue dans TRACKS. Pour commencer, veuillez créer un + compte administrateur :' first_user_title: TRACKS::Sign up as the admin user identity_url: URL d'identification label_auth_type: Type d'authentification @@ -1096,12 +1148,16 @@ fr: new_user_heading: 'Créer un nouvel utilisateur :' new_user_title: TRACKS::Créer un administrateur no_signups_title: TRACKS::Pas de signups - openid_ok_pref_failed: Vous avez vérifié avec succès votre identité comme %{url} mais un problème est survenu lors de la sauvegarde de vos préférences d'authentification. - openid_url_verified: Vous avez vérifié avec succès votre identité comme %{url} et défini votre type authentification comme OpenID + openid_ok_pref_failed: Vous avez vérifié avec succès votre identité comme %{url} + mais un problème est survenu lors de la sauvegarde de vos préférences d'authentification. + openid_url_verified: Vous avez vérifié avec succès votre identité comme %{url} + et défini votre type authentification comme OpenID. password_confirmation_label: Confirmer mot de passe - password_updated: Mot de passe modifié + password_updated: Mot de passe modifié. register_with_cas: Avec votre nom d'utilisateur CAS - select_authentication_type: Sélectionner votre nouveau type d'authentification et cliquer sur 'Modifier type d'authenfication' pour remplacer les paramètres actuels. + select_authentication_type: Sélectionner votre nouveau type d'authentification + et cliquer sur 'Modifier type d'authenfication' pour remplacer les paramètres + actuels. signup: Création signup_new_user: Créer un nouvel utilisateur signup_successful: Utilisateur %{username} créé avec succès. @@ -1114,18 +1170,18 @@ fr: total_users_count: Vous avez %{count} utilisateurs user_created: Utilisateur créé. you_have_to_reset_your_password: Vous devez réinitialiser votre mot de passe + manage_users_title: TRACKS::Gérer les utilisateurs will_paginate: next_label: Suivant » page_entries_info: multi_page: Affiche %{model} de %{from} - %{to} à %{count} au total - multi_page_html: Affiche %{model} %{from} - %{to} à la %{count} au total + multi_page_html: Affiche %{model} %{from} - %{to} à la %{count} + au total single_page: - one: Voir de 1 %{model} - other: Afficher tous les %{count} %{model} - zero: Aucun %{model} trouvés + one: Aucun %{model} trouvés + other: Voir de 1 %{model} single_page_html: - one: Voir de 1 %{model} - other: Afficher tous les %{count} %{model} - zero: Aucun %{model} trouvés - page_gap: "..." + one: Aucun %{model} trouvés + other: Voir de 1 %{model} + page_gap: "…" previous_label: "«Précédent" From 411a928cad2ba6f265a6f2f1f8c98cef381049e4 Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Tue, 5 Jan 2021 19:15:07 +0000 Subject: [PATCH 256/767] Translated using Weblate (French) Currently translated at 100.0% (969 of 969 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fr/ --- config/locales/fr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9ff66c5b..2a19c2f0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -723,8 +723,8 @@ fr: incomplètes visibles index_title: TRACKS::Statistiques labels: - avg_completed: Moy. Réalisé - avg_created: Moy. Créé + avg_completed: Moy. réalisé + avg_created: Moy. créé completed: Complété created: Créé month_avg_completed: "%{months} Month avg completed" @@ -752,7 +752,7 @@ fr: actions: Actions percentage: Pourcentage running_time: Temps en cours d'une action (en semaines). Cliquer sur une barre - pour plus d'info + pour plus d'infos running_time_legend: actions: Actions percentage: Pourcentage @@ -817,7 +817,7 @@ fr: time: "%H:%M" pm: pm todos: - action_deferred: L'action «?%{description}?» a été reportée + 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})" @@ -837,7 +837,7 @@ fr: project_completed: Completed actions in this project project_deferred_pending: Deferred/pending actions in this project project_project: Actions in this project - tag_completed: Completed actions tagged with '%{param}' + tag_completed: Actions terminées marquées avec « %{param} » tag_deferred_pending: Deferred/pending actions tagged with '%{param}' tag_hidden: Hidden actions tagged with '%{param}' add_another_dependency: Ajouter une autre dépendance From 35d9c26f4307b7d0c134dd4419adaa0fc1c4ecdd Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 22:06:24 +0200 Subject: [PATCH 257/767] Version 2.5.2. Some minor dependency updates. --- Gemfile.lock | 14 ++++++++------ config/initializers/tracks.rb | 2 +- doc/CHANGELOG.md | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b4fc7153..4caba292 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM activesupport (>= 4.2.0) highline (2.0.3) htmlentities (4.3.4) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) i18n-tasks (0.9.33) activesupport (>= 4.0.2) @@ -159,14 +159,15 @@ GEM mime-types-data (3.2020.1104) mimemagic (0.3.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.14.2) minitest-stub-const (0.6) mocha (1.12.0) mysql2 (0.5.3) nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.0) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) paperclip (6.1.0) @@ -181,6 +182,7 @@ GEM pg (1.2.3) puma (5.1.1) nio4r (~> 2.0) + racc (1.5.2) rack (2.2.3) rack-mini-profiler (2.3.0) rack (>= 1.2.0) @@ -244,9 +246,9 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.3.0) + rubocop-ast (1.4.0) parser (>= 2.7.1.5) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) safe_yaml (1.0.5) sanitize (5.2.1) crass (~> 1.0.2) diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb index 4acabf49..a114fafa 100644 --- a/config/initializers/tracks.rb +++ b/config/initializers/tracks.rb @@ -1,4 +1,4 @@ -tracks_version='2.5.1' +tracks_version='2.5.2' # comment out next two lines if you do not want (or can not) the date of the # last git commit in the footer info=`git log --pretty=format:"%ai" -1` diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 9a0c50a5..b2223cef 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,5 +1,23 @@ See doc/upgrading.md for the upgrade documentation! +## Version 2.5.2 + +### New features + +* New Finnish locale by the maintainer Jyri-Petteri ”ZeiP” Paloposki. +* Update last login field when validating an existing login. +* Show more users in the user list and allow changing the order criteria. + +### Bug fixes + +* Fix tag-specific task lists to work in a multi-user environment. +* Fix setting the due date in the calendar view. +* Fix a bug causing 500 errors for users with different locales. +* Lots of dependencies have been upgraded. +* Better CI tests. +* Code style fixes. +* Small style issues. + ## Version 2.5.1 ### Security issue disclosure From 569b9a48669a41d6b8f8de13adf80f31873db154 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 22:34:50 +0200 Subject: [PATCH 258/767] Fixed some plurals that Weblate has broken. --- config/locales/de.yml | 33 ++++++++++++++++++++------------- config/locales/en.yml | 37 ++++++++++++++++++++++--------------- config/locales/fi.yml | 30 +++++++++++++++++------------- config/locales/fr.yml | 33 +++++++++++++++++++-------------- 4 files changed, 78 insertions(+), 55 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index f330e643..f0a800f6 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -69,8 +69,8 @@ de: odd: muss ungerade sein record_invalid: 'Validation failed: %{errors}' restrict_dependent_destroy: - one: Невозможно удалить запись, так как есть %{record} зависящая от нее - other: Невозможно удалить запись, так как есть %{record} зависящие от нее + has_one: Cannot delete record because a dependent %{record} exists + has_many: Cannot delete record because dependent %{record} exist taken: ist bereits vergeben too_long: ist zu lang (nicht mehr als %{count} Zeichen) too_short: ist zu kurz (nicht weniger als %{count} Zeichen) @@ -93,6 +93,7 @@ de: actions_midsentence: one: Aufgaben other: Aufgabe + zero: Aufgabe add: Hinzufügen ajaxError: Fehler beim Empfangen vom Server back: Zurück @@ -104,8 +105,9 @@ de: contribute: Mitwirken create: Erstellen days_midsentence: - one: Tagen - other: Tag + one: Tag + other: Tagen + zero: Tagen deferred: aufgeschobene description: Beschreibung drag_handle: Verschieben @@ -124,8 +126,9 @@ de: none: Keine not_available_abbr: n/b note: - one: keine Notizen - other: 1 Notiz + one: 1 Notiz + other: "%{count} Notizen" + zero: keine Notizen notes: Notizen numbered_step: Schritt %{number} ok: Ok @@ -264,11 +267,13 @@ de: other: fast %{count} Jahre half_a_minute: eine halbe Minute less_than_x_minutes: - one: weniger als 1 Minute - other: weniger als eine Minute + one: weniger als eine Minute + other: weniger als %{count} Minuten + zero: weniger als 1 Minute less_than_x_seconds: one: weniger als 1 Sekunde - other: weniger als 1 Sekunde + other: weniger als %{count} Sekunden + zero: weniger als 1 Sekunde over_x_years: one: mehr als 1 Jahr other: mehr als %{count} Jahre @@ -1173,10 +1178,12 @@ de: multi_page_html: Angezeigte %{model} %{from} - %{to} von %{count} insgesamt single_page: - one: Kein %{model} gefunden - other: Angezeigte 1 %{model} + one: Angezeigte 1 %{model} + other: Anzeige aller %{count} %{model} + zero: Kein %{model} gefunden single_page_html: - one: Kein %{model} gefunden - other: Angezeigte 1 %{model} + one: Angezeigte 1 %{model} + other: Anzeige aller %{count} %{model} + zero: Kein %{model} gefunden page_gap: "..." previous_label: "« Zurück" diff --git a/config/locales/en.yml b/config/locales/en.yml index b07a4490..15a6abd5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -70,8 +70,8 @@ en: odd: must be odd record_invalid: 'Validation failed: %{errors}' restrict_dependent_destroy: - one: '' - other: Невозможно удалить запись, так как есть %{record} зависящие от нее + has_one: Cannot delete record because a dependent %{record} exists + has_many: Cannot delete record because dependent %{record} exist taken: has already been taken too_long: is too long (maximum is %{count} characters) too_short: is too short (minimum is %{count} characters) @@ -92,8 +92,9 @@ en: action: Action actions: Actions actions_midsentence: - one: actions - other: action + one: action + other: actions + zero: actions add: Add ajaxError: There was an error retrieving from server back: Back @@ -105,8 +106,9 @@ en: contribute: Contribute create: Create days_midsentence: - one: days - other: day + one: day + other: days + zero: days deferred: deferred description: Description drag_handle: DRAG @@ -125,8 +127,9 @@ en: none: None not_available_abbr: n/a note: - one: no notes - other: 1 note + one: 1 note + other: "%{count} notes" + zero: no notes notes: Notes numbered_step: Step %{number} ok: Ok @@ -266,11 +269,13 @@ en: other: almost %{count} years half_a_minute: half a minute less_than_x_minutes: - one: less than 1 minute - other: less than a minute + one: less than a minute + other: less than %{count} minutes + zero: less than 1 minute less_than_x_seconds: one: less than 1 second - other: less than 1 second + other: less than %{count} seconds + zero: less than 1 second over_x_years: one: over 1 year other: over %{count} years @@ -1165,10 +1170,12 @@ en: multi_page_html: Displaying %{model} %{from} - %{to} of %{count} in total single_page: - one: No %{model} found - other: Displaying 1 %{model} + one: Displaying 1 %{model} + other: Displaying all %{count} %{model} + zero: No %{model} found single_page_html: - one: No %{model} found - other: Displaying 1 %{model} + one: Displaying 1 %{model} + other: Displaying all %{count} %{model} + zero: No %{model} found page_gap: "…" previous_label: "← Previous" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 3cfd09cd..4a4c9f8e 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -69,8 +69,8 @@ fi: odd: täytyy olla pariton record_invalid: 'Validointi epäonnistui: %{errors}' restrict_dependent_destroy: - one: Невозможно удалить запись, так как есть %{record} зависящая от нее - other: Невозможно удалить запись, так как есть %{record} зависящие от нее + has_one: Cannot delete record because a dependent %{record} exists + has_many: Cannot delete record because dependent %{record} exist taken: has already been taken too_long: is too long (maximum is %{count} characters) too_short: is too short (minimum is %{count} characters) @@ -91,8 +91,8 @@ fi: action: Toimenpide actions: Toimenpiteet actions_midsentence: - one: toimenpidettä - other: toimenpide + one: toimenpide + other: toimenpidettä add: Lisää ajaxError: Virhe noudettaessa palvelimelta back: Takaisin @@ -104,8 +104,8 @@ fi: contribute: Osallistu create: Luo days_midsentence: - one: päivää - other: päivä + one: päivä + other: päivää deferred: lykätty description: Kuvaus drag_handle: VEDÄ @@ -124,8 +124,9 @@ fi: none: Ei not_available_abbr: ei note: - one: ei muistiinpanoja - other: 1 muistiinpano + one: 1 muistiinpano + other: "%{count} muistiinpanoa" + zero: ei muistiinpanoja notes: Muistiinpanot numbered_step: Askel %{number} ok: Ok @@ -266,11 +267,13 @@ fi: other: almost %{count} years half_a_minute: half a minute less_than_x_minutes: - one: less than 1 minute - other: less than a minute + one: less than a minute + other: less than %{count} minutes + zero: less than 1 minute less_than_x_seconds: one: less than 1 second - other: less than 1 second + other: less than %{count} seconds + zero: less than 1 second over_x_years: one: over 1 year other: over %{count} years @@ -1166,8 +1169,9 @@ fi: multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta single_page: - one: '%{model} ei löytynyt' - other: Näytetään 1 %{model} + one: Näytetään 1 %{model} + other: Näytetään kaikki %{count} %{model} + zero: '%{model} ei löytynyt' single_page_html: none: Näytetään 1 %{model} other: Näytetään kaikki %{count} %{model} diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2a19c2f0..0b27d9d8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -72,8 +72,8 @@ fr: odd: doit être impair record_invalid: 'La validation a échoué : %{errors}' restrict_dependent_destroy: - one: Невозможно удалить запись, так как есть %{record} зависящая от нее - other: Невозможно удалить запись, так как есть %{record} зависящие от нее + has_one: Cannot delete record because a dependent %{record} exists + has_many: Cannot delete record because dependent %{record} exist taken: est déjà pris too_long: est trop long (maximum de %{count} caractères) too_short: est trop court (minimum de %{count} charactères) @@ -94,8 +94,8 @@ fr: action: Action actions: Actions actions_midsentence: - one: actions - other: action + one: action + other: actions add: Ajouter ajaxError: Une erreur s'est produite en accédant un serveur back: Retour @@ -107,8 +107,8 @@ fr: contribute: Contribuer create: Créer days_midsentence: - one: jours - other: jour + one: jour + other: jours deferred: reportées description: Description drag_handle: DRAG @@ -127,8 +127,9 @@ fr: none: Aucun not_available_abbr: n/a note: - one: non notes - other: 1 note + one: 1 note + other: "%{count} notes" + zero: non notes notes: Notes numbered_step: Étape %{number} ok: OK @@ -268,10 +269,12 @@ fr: half_a_minute: 30 secondes less_than_x_minutes: one: moins d'1 minute - other: moins d'une minute + other: moins de %{count} minutes + zero: moins d'1 minute less_than_x_seconds: one: moins d'1 seconde - other: moins d'1 seconde + other: moins de %{count} secondes + zero: moins d'1 seconde over_x_years: one: plus d'1 an other: plus de %{count} ans @@ -1178,10 +1181,12 @@ fr: multi_page_html: Affiche %{model} %{from} - %{to} à la %{count} au total single_page: - one: Aucun %{model} trouvés - other: Voir de 1 %{model} + one: Voir de 1 %{model} + other: Afficher tous les %{count} %{model} + zero: Aucun %{model} trouvés single_page_html: - one: Aucun %{model} trouvés - other: Voir de 1 %{model} + one: Voir de 1 %{model} + other: Afficher tous les %{count} %{model} + zero: Aucun %{model} trouvés page_gap: "…" previous_label: "«Précédent" From 25f98271bd832aa30197c019aed97ed62de98fe9 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 5 Jan 2021 23:44:29 +0000 Subject: [PATCH 259/767] Translated using Weblate (Finnish) Currently translated at 99.3% (964 of 970 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/ --- config/locales/fi.yml | 260 +++++++++++++++++++++--------------------- 1 file changed, 128 insertions(+), 132 deletions(-) diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 4a4c9f8e..e41b4631 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -42,7 +42,7 @@ fi: user: auth_type: Kirjautumistyyppi display_name: Näyttönimi - email: Email address + email: Sähköpostiosoite first_name: Etunimi last_name: Sukunimi login: Login @@ -71,10 +71,10 @@ fi: restrict_dependent_destroy: has_one: Cannot delete record because a dependent %{record} exists has_many: Cannot delete record because dependent %{record} exist - taken: has already been taken - too_long: is too long (maximum is %{count} characters) - too_short: is too short (minimum is %{count} characters) - wrong_length: is the wrong length (should be %{count} characters) + taken: on jo varattu + too_long: on liian pitkä (enimmäispituus on %{count} merkkiä) + too_short: on liian lyhyt (vähimmäispituus on %{count} merkkiä) + wrong_length: on väärän pituinen (tulisi olla %{count} merkkiä) models: project: attributes: @@ -99,7 +99,7 @@ fi: bugs: Ohjelmavirheet cancel: Peruuta collapse_expand: Sulje/avaa - context: Asiayhtyes + context: Asiayhteys contexts: Asiayhteydet contribute: Osallistu create: Luo @@ -115,7 +115,7 @@ fi: forth: Neljäs fourth: Neljäs go_back: Takaisin - last: Viimeinen + last: Viimeisimmät logout: Kirjaudu ulos mailing_list: Postituslista month: kuukausi @@ -124,9 +124,8 @@ fi: none: Ei not_available_abbr: ei note: - one: 1 muistiinpano - other: "%{count} muistiinpanoa" - zero: ei muistiinpanoja + one: ei muistiinpanoja + other: 1 muistiinpano notes: Muistiinpanot numbered_step: Askel %{number} ok: Ok @@ -167,32 +166,31 @@ fi: context_name: Asiayhteyden nimi context_state: Asiayhteyden tila delete_context: Poista asiayhteys - delete_context_confirmation: Are you sure that you want to delete the context - '%{name}'? Be aware that this will also delete all (recurring) actions in this - context! + delete_context_confirmation: Oletko varma, että haluat poistaa asiayhteyden ”%{name}”? + Samalla poistetaan myös kaikki asiayhteyteen liittyvät (toistuvat) toimenpiteet! delete_context_title: Poista asiayhteys edit_context: Muokkaa asiayhteyttä hidden_contexts: Piilotetut asiayhteydet hide_form: Piilota lomake hide_form_title: Piilota asiayhteyden lisäyslomake - last_completed_in_context: "(last %{number})" - new_context_post: "' will be also created. Are you sure?" - new_context_pre: New context ' - no_contexts_: 'No contexts ' + last_completed_in_context: "(viimeinen %{number})" + new_context_post: "' luodaan. Oletko varma?" + new_context_pre: Uusi asiayhteys ' + no_contexts_: 'Ei asiayhteyksiä ' no_contexts_active: Currently there are no active contexts - no_contexts_closed: Currently there are no closed contexts + no_contexts_closed: Suljettuja asiayhteyksiä ei ole no_contexts_hidden: Currently there are no hidden contexts save_status_message: Asiayhteys tallennettu show_form: Luo uusi asiayhteys show_form_title: Lisää asiayhteys status_active: Context is active - status_hidden: Context is hidden - todos_append: in this context - update_status_message: Name of context was changed + status_hidden: Asiayhteys on piilotettu + todos_append: tässä asiayhteydessä + update_status_message: Asiayhteyden nimi muutettiin visible_contexts: Näkyvät asiayhteydet data: - import_destination_invalid: Invalid import destination - import_errors: Some errors occurred during import + import_destination_invalid: Virheellinen tuonnin kohde + import_errors: Tuonnissa tapahtui virheitä import_successful: Tuonti onnistui. invalid_import_destination: Invalid import destination date: @@ -267,13 +265,11 @@ fi: other: almost %{count} years half_a_minute: half a minute less_than_x_minutes: - one: less than a minute - other: less than %{count} minutes - zero: less than 1 minute + one: less than 1 minute + other: less than a minute less_than_x_seconds: one: less than 1 second - other: less than %{count} seconds - zero: less than 1 second + other: less than 1 second over_x_years: one: over 1 year other: over %{count} years @@ -299,28 +295,28 @@ fi: errors: format: "%{attribute} %{message}" messages: - accepted: должен быть подтвержден - blank: должна быть заполнена - confirmation: не соответствует %{attribute} - empty: не может быть пустым - equal_to: должно равняться %{count} - even: должно быть четным - exclusion: зарезервированно - greater_than: должно быть больше %{count} - greater_than_or_equal_to: должно быть больше или равно %{count} - inclusion: не входит в список - invalid: неверное - less_than: должно быть меньше %{count} - less_than_or_equal_to: должно быть меньше или равно %{count} - not_a_number: не является числом - not_an_integer: должно быть целым числом - odd: должно быть нечетным - other_than: должно отличаться от %{count} - present: должно быть пустым - taken: уже занято - too_long: 'слишком длинное (максимум: %{count} символов)' - too_short: 'слишком кроткое (минимум: %{count} символов)' - wrong_length: неверной длины (должно быть %{count} символов) + accepted: tulee hyväksyä + blank: ei voi olla tyhjä + confirmation: ei vastaa %{attribute} + empty: ei voi olla tyhjä + equal_to: tulee olla yhtä kuin %{count} + even: tulee olla parillinen + exclusion: on varattu + greater_than: tulee olla suurempi kuin %{count} + greater_than_or_equal_to: tulee olla suurempi tai yhtäsuuri kuin %{count} + inclusion: ei sisälly listaan + invalid: ei ole kelvollinen + less_than: tulee olla vähemmän kuin %{count} + less_than_or_equal_to: tulee olla vähemmän tai yhtäsuuri kuin %{count} + not_a_number: ei ole numero + not_an_integer: tulee olla kokonaisluku + odd: tulee olla pariton + other_than: tulee olla erisuuri kuin %{count} + present: tulee olla tyhjä + taken: on jo varattu + too_long: 'on liian pitkä (enimmäispituus on %{count} merkkiä)' + too_short: 'on liian lyhyt (vähimmäispituus on %{count} merkkiä)' + wrong_length: on väärän pituinen (tulee olla %{count} merkkiä) user_unauthorized: '401 Pääsy kielletty: Vain ylläpitäjillä on pääsy tähän toiminnallisuuteen.' feedlist: actions_completed_last_week: Actions completed in the last 7 days @@ -355,11 +351,11 @@ fi: send_feedback: Lähetä palautetta versiosta %{version} helpers: select: - prompt: Выберите + prompt: Valitse submit: - create: Создать %{model} - submit: Сохранить %{model} - update: Обновить %{model} + create: Luo %{model} + submit: Tallenna %{model} + update: Päivitä %{model} integrations: opensearch_description: Search in Tracks layouts: @@ -420,10 +416,10 @@ fi: tickler_title: Tulevat view: Näytä next_actions_rss_feed: RSS feed of next actions - toggle_contexts: Toggle collapsed contexts - toggle_contexts_title: Make collapsed contexts (in)visible - toggle_notes: Toggle notes - toggle_notes_title: Toggle all notes + toggle_contexts: Vaihda suljettujen asiayhteyksien tilaa + toggle_contexts_title: Muuta suljetut asiayhteydet näkyviksi tai näkymättömiksi + toggle_notes: Vaihda muistiinpanojen tilaa + toggle_notes_title: Vaihda kaikkien muistiinpanojen tilaa login: account_login: Account login cas_create_account: If you like to request on please go here to %{signup_link} @@ -452,10 +448,10 @@ fi: user_no_expiry: Stay logged in models: preference: - due_in: Due in %{days} days + due_in: Tehtävä %{days} päivän päästä due_on: Due on %{date} due_styles: - - Due in ___ days + - Tehtävä ___ päivän päästä - Due on _______ themes: black: Black @@ -568,9 +564,9 @@ fi: projects: actions_in_project_title: Actions in this project active_projects: Active projects - add_note: Add a note - add_note_submit: Add note - add_project: Add Project + add_note: Lisää muistiinpano + add_note_submit: Lisää muistiinpano + add_project: Lisää projekti all_completed_tasks_title: TRACKS::List All Completed Actions in Project '%{project_name}' completed_actions: Completed actions completed_actions_empty: Completed actions empty @@ -609,12 +605,12 @@ fi: project_state: Project is %{state}. set_default_tags_notice: Set project's default tags to %{default_tags} settings: Settings - show_form: Add a project + show_form: Lisää projekti show_form_title: Create a new project state: Tämä projekti on %{state} status_project_name_changed: Name of project was changed this_project: This project - to_new_project_page: Take me to the new project page + to_new_project_page: Siirry uuden projektin sivulle was_marked_complete: has been marked as completed was_marked_hidden: has been marked as hidden with_default_context: with a default context of '%{context_name}' @@ -622,12 +618,12 @@ fi: with_no_default_context: with no default context with_no_default_tags: and with no default tags search: - contexts_matching_query: Contexts matching query + contexts_matching_query: hakua vastaavaa asiayhteyttä no_results: Your search yielded no results. - notes_matching_query: Notes matching query - projects_matching_query: Projects matching query - tags_matching_query: Tags matching query - todos_matching_query: Todos matching query + notes_matching_query: hakua vastaavaa muistiinpanoa + projects_matching_query: hakua vastaavaa projektia + tags_matching_query: hakua vastaavaa asiasanaa + todos_matching_query: hakua vastaavaa toimenpidettä shared: add_action: Lisää toimenpide add_actions: Lisää toimenpiteitä @@ -717,8 +713,8 @@ fi: 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} - and further. + click_to_show_actions_from_week: Klikkaa %{link} näyttääksesi toimenpiteet viikosta + %{week} eteenpäin. click_to_update_actions: Click on a bar in the chart to update the actions below. contexts: Contexts current_running_time_of_incomplete_visible_actions: Current running time of incomplete @@ -726,9 +722,9 @@ fi: index_title: TRACKS::Tilastot labels: avg_completed: Avg completed - avg_created: Avg created + avg_created: Keskimäärin luotu completed: Completed - created: Created + created: Luotu month_avg_completed: "%{months} Month avg completed" month_avg_created: "%{months} Month avg created" legend: @@ -783,21 +779,21 @@ fi: top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions totals: Totals - totals_action_count: you have a total of %{count} actions - 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_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_action_count: sinulla on yhteensä %{count} toimenpidettä + totals_actions_completed: "%{count} näistä on valmistuneita." + totals_active_project_count: Joista %{count} on aktiivisia projekteja + totals_blocked_actions: "%{count} on riippuvaisia toimenpiteidensä valmistumisesta." + totals_completed_project_count: ja %{count} on valmistuneita projekteja. + totals_context_count: Sinulla on %{count} asiayhteyttä. + totals_deferred_actions: joista %{count} on lykättyjä toimenpiteitä ticklerissä totals_first_action: Since your first action on %{date} - totals_hidden_context_count: and %{count} are hidden contexts. + totals_hidden_context_count: ja %{count} on piilotettuja asiayhteyksiä. 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. + totals_incomplete_actions: Sinulla on %{count} keskeneräistä toimenpidettä + totals_project_count: Sinulla on %{count} projektia. + totals_tag_count: Sinulla on %{count} asiasanaa yhdistettynä toimenpiteisiin. totals_unique_tags: Of those tags, %{count} are unique. - totals_visible_context_count: Of those %{count} are visible contexts + totals_visible_context_count: Näistä %{count} on näkyviä asiayhteyksiä within_one: Within 1 support: array: @@ -829,7 +825,7 @@ fi: action_saved_to_tickler: Action saved to tickler actions: completed: Completed actions - context_completed: Completed actions in this context + context_completed: Valmistuneet toimenpiteet tässä asiayhteydessä context_deferred_pending: Deferred/pending actions in this context context_without_project: Actions without project in %{param} home_completed: Completed actions @@ -837,8 +833,8 @@ fi: project_completed: Completed actions in this project project_deferred_pending: Deferred/pending actions in this project project_project: Actions in this project - tag_completed: Completed actions tagged with '%{param}' - tag_deferred_pending: Deferred/pending actions tagged with '%{param}' + tag_completed: Valmistuneet toimenpiteet avainsanalla ”%{param}” + tag_deferred_pending: Lykätyt/odottavat toimenpiteet asiasanalla ”%{param}” tag_hidden: Tagilla '%{param}' merkityt piilotetut toimenpiteet add_another_dependency: Add another dependency add_new_recurring: Lisää uusi toistuva toimenpide @@ -847,7 +843,7 @@ fi: added_new_next_action: Added new next action added_new_next_action_plural: Added new next actions added_new_next_action_singular: Added new next action - added_new_project: Added new project + added_new_project: Uusi projekti lisätty all_completed: All completed actions all_completed_here: here all_completed_tagged_page_title: TRACKS::All completed tasks with tag %{tag_name} @@ -860,12 +856,12 @@ fi: due_this_month: Tehtävä loppukuukauden %{month} aikana due_this_week: Tehtävä loppuviikon aikana due_today: Tehtävä tänään - get_in_ical_format: Get this calendar in iCal format + get_in_ical_format: Nouda tämä kalenteri iCal-muodossa calendar_page_title: TRACKS::Kalenteri cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action! clear_due_date: Clear due date - clear_show_from_date: Clear show from date + clear_show_from_date: Tyhjennä Näytä alkaen -ajankohta completed: Completed completed_actions: Completed actions completed_actions_with: Completed actions with the tag '%{tag_name}' @@ -874,8 +870,8 @@ fi: other: There are %{count} completed actions in the archive. completed_last_day: Completed in the last 24 hours completed_last_x_days: Completed in the last %{count} days - completed_recurrence_completed: There is no next action after the recurring action - you just deleted. The recurrence is completed + completed_recurrence_completed: Poistamasi toistuvan toimenpiteen jälkeen ei ole + muita toimenpiteitä. Toistuvuus on päättynyt completed_recurring: Completed recurring todos completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Completed in the rest of this month @@ -909,11 +905,11 @@ fi: due: Due edit: Edit edit_action: Edit action - edit_action_with_description: Edit the action '%{description}' + edit_action_with_description: Muokkaa toimenpidettä ”%{description}” edit_recurring_todo: Muokkaa toistuvaa toimenpidettä error: - invalid_due_date: Invalid due date - invalid_show_from_date: Invalid show from date + invalid_due_date: Virheellinen määräpäivä + invalid_show_from_date: Virheellinen Näytä alkaen -ajankohta error_completing_todo: There was an error completing / activating the recurring todo %{description} error_deleting_item: There was an error deleting the item %{description} @@ -921,7 +917,8 @@ fi: error_removing_dependency: There was an error removing the dependency error_saving_recurring: There was an error saving the recurring todo '%{description}' error_starring: Could not toggle the star of this todo '%{description}' - error_starring_recurring: Could not toggle the star of recurring todo '%{description}' + error_starring_recurring: Toistuvan toimenpiteen ”%{description}” tähtimerkinnän + vaihto epäonnistui error_toggle_complete: Could not mark this todo complete feed_title_in_context: in context '%{context}' feed_title_in_project: in project '%{project}' @@ -959,19 +956,19 @@ fi: next_actions_title_additions: completed: actions completed due_today: due today - due_within_a_week: due within a week + due_within_a_week: tehtävä viikon sisällä no_actions: completed: Currently there are no completed actions - completed_recurring: Currently there are no completed recurring todos + completed_recurring: Valmistuneita toistuvia toimenpiteitä ei ole completed_rest_of_month: No actions were completed in the rest of this month completed_rest_of_week: No actions were completed in the rest of this week completed_today: No actions were completed today context: Currently there are no incomplete actions in this context deferred_pending: Currently there are no deferred or pending actions due_after_this_month: No actions due after this month - due_next_week: No actions due in next week - due_this_month: No actions due in rest of this month - due_this_week: No actions due this week + due_next_week: Ei viikon sisällä erääntyviä toimenpiteitä + due_this_month: Ei loppukuukauden aikana erääntyviä toimenpiteitä + due_this_week: Ei tällä viikolla tehtäviä toimenpiteitä due_today: No actions due today hidden: Currently there are no hidden actions found not_done: Currently there are no incomplete actions @@ -981,23 +978,23 @@ fi: not_done_with_tag: Tagilla '%{param}' merkittyjä keskeneräisiä toimenpiteitä ei löytynyt project: Currently there are no incomplete actions in this project - recurring_todos: Currently there are no recurring todos + recurring_todos: Toistuvia toimenpiteitä ei ole tag_hidden: Currently there are no hidden actions found title: Toimenpiteitä ei löytynyt without_project: Currently there are no actions without a project - no_actions_due_this_week: No actions due in rest of this week + no_actions_due_this_week: Ei loppuviikon aikana erääntyviä toimenpiteitä no_actions_found_title: No actions found title no_actions_with: No actions with no_completed_actions: No completed actions no_completed_actions_with: No completed actions with - no_completed_recurring: No completed recurring + no_completed_recurring: Ei valmistuneita toistuvia no_deferred_actions: No deferred actions no_deferred_actions_with: No deferred actions with no_last_completed_actions: No completed actions found no_project: "--No project--" - no_recurring_todos: No recurring todos + no_recurring_todos: Ei toistuvia toimenpiteitä notes: Notes - overdue: Overdue + overdue: Myöhässä pending: Odottaa recurrence: daily: Päivittäin @@ -1071,8 +1068,8 @@ fi: yearly_every_x_day: Joka %{month} %{day} yearly_every_xth_day: The %{day} %{day_of_week} of %{month} yearly_options: Settings for yearly recurring actions - recurrence_completed: There is no next action after the recurring action you just - finished. The recurrence is completed + recurrence_completed: Valmistuneen toistuvan toimenpiteen jälkeen ei ole muita + toimenpiteitä. Toistuvuus on päättynyt recurrence_period: Toistuvuusjakso recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added @@ -1083,10 +1080,10 @@ fi: recurring_todos: Toistuvat toimenpiteet remove_dependency: Remove dependency (does not delete the action) removed_predecessor: Removed %{successor} as dependency from %{predecessor}. - scheduled_overdue: Scheduled to show %{days} days ago + scheduled_overdue: Ajastettu näkymään %{days} päivän päästä see_all_completed: You can see all completed actions %{link} set_to_pending: "%{task} set to pending" - show_from: Show from + show_from: Näytä alkaen show_in_days: Näytetään %{days} päivän kuluttua show_on_date: Show on %{date} show_today: Show Today @@ -1095,7 +1092,7 @@ fi: star_action_with_description: star the action '%{description}' tagged_page_title: TRACKS::Tagged with '%{tag_name}' tagged_with: tagged with '%{tag_name}' - tags: Tags (separate with commas) + tags: Avainsanat (erota pilkulla) task_list_title: TRACKS::List tasks tickler_items_due: one: One tickler item is now due - refresh the page to see it. @@ -1122,24 +1119,24 @@ fi: choose_password: Choose password confirm_password: Confirm password desired_login: Desired login - destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their - actions, contexts, project and notes. Are you sure that you want to continue?' - destroy_error: There was an error deleting the user %{login} - destroy_successful: User %{login} was successfully destroyed - destroy_user: Destroy user - email_address: Email address + destroy_confirmation: 'Varoitus: Tämä poistaa käyttäjän ”%{login}”, kaikki toimenpiteet, + asiayhteydet, projektit ja muistiinpanot. Oletko varma että haluat jatkaa?' + destroy_error: Käyttäjän %{login} poistamisessa tapahtui virhe + destroy_successful: Käyttäjä %{login} poistettiin onnistuneesti + destroy_user: Poista käyttäjä + email_address: Sähköpostiosoite failed_to_delete_user: Failed to delete user %{username} first_user_heading: 'Welcome to TRACKS. To get started, please create an admin account:' first_user_title: TRACKS::Sign up as the admin user identity_url: Identity URL label_auth_type: Authentication type - manage_users: Manage users + manage_users: Hallitse käyttäjiä manage_users_title: TRACKS::Hallitse käyttäjiä new_password_label: New password new_token_generated: New token successfully generated - new_user_heading: 'Sign up a new user:' - new_user_title: TRACKS::Sign up + new_user_heading: 'Rekisteröi uusi käyttäjä:' + new_user_title: TRACKS::Rekisteröidy no_signups_title: TRACKS::Ei rekisteröitymisiä openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences. @@ -1151,16 +1148,16 @@ fi: select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings. signup: Signup - signup_new_user: Sign up new user + signup_new_user: Rekisteröi uusi käyttäjä signup_successful: Signup successful for user %{username}. successfully_deleted_user: Successfully deleted user %{username} tos_link: read the Terms of Service - total_actions: Total actions - total_contexts: Total contexts - total_notes: Total notes - total_projects: Total projects - total_users_count: You have a total of %{count} users - user_created: User created. + total_actions: Yhteensä toimenpiteitä + total_contexts: Yhteensä asiayhteyksiä + total_notes: Yhteensä muistiinpanoja + total_projects: Yhteensä projekteja + total_users_count: Sinulla on yhteensä %{count} käyttäjää + user_created: Käyttäjä luotu. you_have_to_reset_your_password: You have to reset your password will_paginate: next_label: Seuraava → @@ -1169,9 +1166,8 @@ fi: multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta single_page: - one: Näytetään 1 %{model} - other: Näytetään kaikki %{count} %{model} - zero: '%{model} ei löytynyt' + one: '%{model} ei löytynyt' + other: Näytetään 1 %{model} single_page_html: none: Näytetään 1 %{model} other: Näytetään kaikki %{count} %{model} From d4c9041ccd7c38ee050c18bb6f84bf75f26da25b Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 27 Oct 2020 21:39:19 +0200 Subject: [PATCH 260/767] More code style fixes --- .ruby-version | 1 + Gemfile | 17 ++- app/controllers/application_controller.rb | 16 +-- app/controllers/calendar_controller.rb | 2 +- app/controllers/contexts_controller.rb | 4 +- app/controllers/data_controller.rb | 58 ++++----- app/controllers/integrations_controller.rb | 10 +- app/controllers/login_controller.rb | 14 +- app/controllers/mailgun_controller.rb | 2 +- app/controllers/notes_controller.rb | 2 +- app/controllers/projects_controller.rb | 4 +- .../recurring_todos/form_helper.rb | 2 +- app/controllers/recurring_todos_controller.rb | 34 ++--- app/controllers/stats_controller.rb | 16 +-- .../todos/todo_create_params_helper.rb | 7 +- app/controllers/todos_controller.rb | 114 ++++++++-------- app/controllers/users_controller.rb | 10 +- app/helpers/application_helper.rb | 14 +- app/helpers/bootstrap_flash_helper.rb | 5 +- app/helpers/contexts_helper.rb | 6 +- app/helpers/date_label_helper.rb | 12 +- app/helpers/feedlist_helper.rb | 4 +- app/helpers/notes_helper.rb | 5 +- app/helpers/projects_helper.rb | 15 +-- app/helpers/recurring_todos_helper.rb | 4 +- app/helpers/rendering_helper.rb | 2 +- app/helpers/todos_helper.rb | 122 +++++++++--------- app/helpers/users_helper.rb | 7 +- app/models/context.rb | 4 +- app/models/message_gateway.rb | 6 +- app/models/project.rb | 14 +- app/models/recurring_todo.rb | 16 ++- .../abstract_recurrence_pattern.rb | 10 +- .../abstract_recurring_todos_builder.rb | 2 +- .../daily_recurrence_pattern.rb | 4 +- .../weekly_recurrence_pattern.rb | 12 +- .../yearly_recurrence_pattern.rb | 6 +- app/models/search/search_results.rb | 24 ++-- app/models/stats/actions.rb | 6 +- app/models/stats/projects.rb | 2 +- app/models/tag.rb | 3 +- app/models/tagging.rb | 2 +- app/models/todo.rb | 52 ++++---- app/models/user.rb | 53 ++++---- app/services/rich_message_extractor.rb | 8 +- .../integrations/search_plugin.xml.builder | 8 +- app/views/projects/index.atom.builder | 2 +- app/views/recurring_todos/_edit_form.html.erb | 2 +- app/views/todos/_new_todo_form.html.erb | 2 +- app/views/todos/index.rss.builder | 2 +- doc/tracks_api_wrapper.rb | 18 ++- doc/tracks_cli/tracks_api.rb | 10 +- doc/tracks_cli/tracks_xml_builder.rb | 9 +- doc/tracks_template_cli.rb | 7 +- lib/done_todos.rb | 10 +- lib/is_taggable.rb | 8 +- lib/login_system.rb | 10 +- lib/tracks/attribute_handler.rb | 2 +- lib/tracks/config.rb | 2 +- public/dispatch.rb | 1 - .../tracks_cli/tracks_xml_builder_test.rb | 2 +- 61 files changed, 406 insertions(+), 422 deletions(-) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..95e3ba81 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5 diff --git a/Gemfile b/Gemfile index 4d6d2421..7609b85a 100644 --- a/Gemfile +++ b/Gemfile @@ -56,16 +56,15 @@ group :development, :test do end group :test do - gem 'rails-controller-testing' - gem 'rails-dom-testing', '~> 2.0.0' - gem 'factory_bot_rails' - gem 'rspec-expectations' - gem 'database_cleaner' - gem 'mocha', :require => false - gem 'minitest-stub-const' - - gem 'simplecov' # get test coverage info on codeclimate gem 'codeclimate-test-reporter', '1.0.7', group: :test, require: nil + gem 'database_cleaner' + gem 'factory_bot_rails' + gem 'mocha', :require => false + gem 'minitest-stub-const' + gem 'rails-controller-testing' + gem 'rails-dom-testing', '~> 2.0.0' + gem 'rspec-expectations' + gem 'simplecov' end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1812b9ac..5b4e2407 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -10,7 +10,7 @@ class ApplicationController < ActionController::Base include Common helper_method :current_user, :prefs, :format_date - layout proc{ |controller| controller.mobile? ? "mobile" : "application" } + layout proc { |controller| controller.mobile? ? "mobile" : "application" } # exempt_from_layout /\.js\.erb$/ before_action :set_session_expiration @@ -27,7 +27,7 @@ class ApplicationController < ActionController::Base locale ||= prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE'] - if locale && I18n::available_locales.map(&:to_s).include?(locale.to_s) + if locale && I18n.available_locales.map(&:to_s).include?(locale.to_s) I18n.locale = locale else I18n.locale = I18n.default_locale @@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base # If the method is called by the feed controller (which we don't have # under session control) or if we checked the box to keep logged in on # login don't set the session expiry time. - return if session.nil? || self.controller_name == 'feed' || session['noexpiry'] == "on" + return if session.nil? || controller_name == 'feed' || session['noexpiry'] == "on" # Get expiry time (allow ten seconds window for the case where we have # none) @@ -50,11 +50,11 @@ class ApplicationController < ActionController::Base reset_session else # Okay, you get another hour - session['expiry_time'] = now + (60*60) + session['expiry_time'] = now + (60 * 60) end end - def render_failure message, status = 404 + def render_failure(message, status = 404) render :body => message, :status => status end @@ -101,8 +101,8 @@ class ApplicationController < ActionController::Base def for_autocomplete(coll, substr) if substr # protect agains empty request - filtered = coll.find_all{ |item| item.name.downcase.include? substr.downcase } - json_elems = Array[*filtered.map{ |e| { :id => e.id.to_s, :value => e.name } }].to_json + filtered = coll.find_all { |item| item.name.downcase.include? substr.downcase } + json_elems = Array[*filtered.map { |e| { :id => e.id.to_s, :value => e.name } }].to_json return json_elems else return "" @@ -272,7 +272,7 @@ class ApplicationController < ActionController::Base def done_todos_for(object) object_name = object.class.name.downcase # context or project @source_view = "done" - eval("@#{object_name} = object") + eval("@#{object_name} = object", binding, __FILE__, __LINE__) @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.todos) diff --git a/app/controllers/calendar_controller.rb b/app/controllers/calendar_controller.rb index 87f37ea5..55a8dd97 100644 --- a/app/controllers/calendar_controller.rb +++ b/app/controllers/calendar_controller.rb @@ -15,7 +15,7 @@ class CalendarController < ApplicationController format.html format.m { cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } } format.ics { render :action => 'show', :layout => false, :content_type => Mime[:ics] } - format.xml { render :xml => @due_all.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } + format.xml { render :xml => @due_all.to_xml(*[todo_xml_params[0].merge({ :root => :todos })]) } end end end diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb index 3121ac56..b1ff4c1b 100644 --- a/app/controllers/contexts_controller.rb +++ b/app/controllers/contexts_controller.rb @@ -98,7 +98,7 @@ class ContextsController < ApplicationController @context.attributes = context_params @saved = @context.save @state_saved = set_state_for_update(@new_state) - @saved = @saved && @state_saved + @saved &&= @state_saved if @saved @state_changed = (@original_context_state != @context.state) @@ -148,7 +148,7 @@ class ContextsController < ApplicationController # def order context_ids = params["container_context"] - @projects = current_user.contexts.update_positions( context_ids ) + @projects = current_user.contexts.update_positions(context_ids) head :ok rescue notify :error, $! diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb index e0444fd8..16ed4fcc 100644 --- a/app/controllers/data_controller.rb +++ b/app/controllers/data_controller.rb @@ -5,8 +5,7 @@ class DataController < ApplicationController @page_title = "TRACKS::Export" end - def import - end + def import; end def csv_map if params[:file].blank? @@ -16,17 +15,17 @@ class DataController < ApplicationController @import_to = params[:import_to] begin - #get column headers and format as [['name', column_number]...] + # Get column headers and format as [['name', column_number]...] i = -1 - @headers = import_headers(params[:file].path).collect { |v| [v, i+=1] } - @headers.unshift ['',i] + @headers = import_headers(params[:file].path).collect { |v| [v, i += 1] } + @headers.unshift ['', i] rescue Exception => e flash[:error] = "Invalid CVS: could not read headers: #{e}" redirect_to :back return end - #save file for later + # Save file for later begin uploaded_file = params[:file] @filename = sanitize_filename(uploaded_file.original_filename) @@ -94,17 +93,17 @@ class DataController < ApplicationController all_tables['projects'] = current_user.projects.load todo_tag_ids = Tag.find_by_sql([ - "SELECT DISTINCT tags.id "+ - "FROM tags, taggings, todos "+ - "WHERE todos.user_id=? "+ - "AND tags.id = taggings.tag_id " + - "AND taggings.taggable_id = todos.id ", current_user.id]) + "SELECT DISTINCT tags.id + FROM tags, taggings, todos + WHERE todos.user_id = ? + AND tags.id = taggings.tag_id + AND taggings.taggable_id = todos.id", current_user.id]) rec_todo_tag_ids = Tag.find_by_sql([ - "SELECT DISTINCT tags.id "+ - "FROM tags, taggings, recurring_todos "+ - "WHERE recurring_todos.user_id=? "+ - "AND tags.id = taggings.tag_id " + - "AND taggings.taggable_id = recurring_todos.id ", current_user.id]) + "SELECT DISTINCT tags.id + FROM tags, taggings, recurring_todos + WHERE recurring_todos.user_id = ? + AND tags.id = taggings.tag_id + AND taggings.taggable_id = recurring_todos.id", current_user.id]) tags = Tag.where("id IN (?) OR id IN (?)", todo_tag_ids, rec_todo_tag_ids) taggings = Tagging.where("tag_id IN (?) OR tag_id IN(?)", todo_tag_ids, rec_todo_tag_ids) @@ -114,7 +113,8 @@ class DataController < ApplicationController all_tables['recurring_todos'] = current_user.recurring_todos.load result = all_tables.to_yaml - result.gsub!(/\n/, "\r\n") # TODO: general functionality for line endings + # TODO: general functionality for line endings + result.gsub!(/\n/, "\r\n") send_data(result, :filename => "tracks_backup.yml", :type => 'text/plain') end @@ -129,7 +129,7 @@ class DataController < ApplicationController csv << [todo.id, todo.context.name, todo.project_id.nil? ? "" : todo.project.name, todo.description, - todo.notes, todo.tags.collect{|t| t.name}.join(', '), + todo.notes, todo.tags.collect { |t| t.name }.join(', '), todo.created_at.to_formatted_s(:db), todo.due? ? todo.due.to_formatted_s(:db) : "", todo.completed_at? ? todo.completed_at.to_formatted_s(:db) : "", @@ -163,17 +163,17 @@ class DataController < ApplicationController def xml_export todo_tag_ids = Tag.find_by_sql([ - "SELECT DISTINCT tags.id "+ - "FROM tags, taggings, todos "+ - "WHERE todos.user_id=? "+ - "AND tags.id = taggings.tag_id " + - "AND taggings.taggable_id = todos.id ", current_user.id]) + "SELECT DISTINCT tags.id + FROM tags, taggings, todos + WHERE todos.user_id = ? + AND tags.id = taggings.tag_id + AND taggings.taggable_id = todos.id", current_user.id]) rec_todo_tag_ids = Tag.find_by_sql([ - "SELECT DISTINCT tags.id "+ - "FROM tags, taggings, recurring_todos "+ - "WHERE recurring_todos.user_id=? "+ - "AND tags.id = taggings.tag_id " + - "AND taggings.taggable_id = recurring_todos.id ", current_user.id]) + "SELECT DISTINCT tags.id + FROM tags, taggings, recurring_todos + WHERE recurring_todos.user_id = ? + AND tags.id = taggings.tag_id + AND taggings.taggable_id = recurring_todos.id", current_user.id]) tags = Tag.where("id IN (?) OR id IN (?)", todo_tag_ids, rec_todo_tag_ids) taggings = Tagging.where("tag_id IN (?) OR tag_id IN(?)", todo_tag_ids, rec_todo_tag_ids) @@ -195,7 +195,7 @@ class DataController < ApplicationController # adjusts time to utc def adjust_time(timestring) - if (timestring == '') or (timestring == nil) + if (timestring == '') || (timestring == nil) return nil else return Time.parse(timestring + 'UTC') diff --git a/app/controllers/integrations_controller.rb b/app/controllers/integrations_controller.rb index dd2b841e..bb47497b 100644 --- a/app/controllers/integrations_controller.rb +++ b/app/controllers/integrations_controller.rb @@ -17,8 +17,8 @@ class IntegrationsController < ApplicationController end def search_plugin - @icon_data = [File.open(File.join(Rails.root, 'app', 'assets', 'images', 'done.png')).read]. - pack('m').gsub(/\n/, '') + @icon_data = [File.open(File.join(Rails.root, 'app', 'assets', 'images', 'done.png')).read] + .pack('m').gsub(/\n/, '') end def cloudmailin @@ -37,18 +37,18 @@ class IntegrationsController < ApplicationController private def process_message(message) - MessageGateway::receive(Mail.new(message)) + MessageGateway.receive(Mail.new(message)) end def verify_cloudmailin_signature provided = request.request_parameters.delete(:signature) - signature = Digest::MD5.hexdigest(flatten_params(request.request_parameters).sort.map{|k,v| v}.join + SITE_CONFIG['cloudmailin']) + signature = Digest::MD5.hexdigest(flatten_params(request.request_parameters).sort.map { |k, v| v }.join + SITE_CONFIG['cloudmailin']) return provided == signature end def flatten_params(params, title = nil, result = {}) params.each do |key, value| - if value.kind_of?(Hash) + if value.is_a? Hash key_name = title ? "#{title}[#{key}]" : key flatten_params(value, key_name, result) else diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index ec6c7c30..af5a9232 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -15,8 +15,8 @@ class LoginController < ApplicationController cookies[:preferred_auth] = prefered_auth? unless cookies[:preferred_auth] case request.method when 'POST' - if @user = User.authenticate(params['user_login'], params['user_password']) - @user.update_attribute(:last_login_at, Time.now) + if (@user = User.authenticate(params['user_login'], params['user_password'])) + @user.update_attribute(:last_login_at, Time.zone.now) return handle_post_success else handle_post_failure @@ -43,8 +43,8 @@ class LoginController < ApplicationController if session return unless should_expire_sessions? # Get expiry time (allow ten seconds window for the case where we have none) - time_left = expiry_time - Time.now - @session_expired = ( time_left < (10 * 60) ) # Session will time out before the next check + time_left = expiry_time - Time.zone.now + @session_expired = (time_left < (10 * 60)) # Session will time out before the next check end end respond_to do |format| @@ -61,10 +61,10 @@ class LoginController < ApplicationController session['noexpiry'] = params['user_noexpiry'] msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire." notify :notice, "Login successful: session #{msg}" - cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] } + cookies[:tracks_login] = { :value => @user.login, :expires => Time.zone.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] } unless should_expire_sessions? @user.remember_me - cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] } + cookies[:auth_token] = { :value => @user.remember_token, :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] } end redirect_back_or_home end @@ -79,7 +79,7 @@ class LoginController < ApplicationController end def expiry_time - return Time.now + 10 unless session['expiry_time'] + return Time.zone.now + 10 unless session['expiry_time'] DateTime.strptime(session['expiry_time'], "%FT%T.%L%Z") end end diff --git a/app/controllers/mailgun_controller.rb b/app/controllers/mailgun_controller.rb index 0618a5a2..d3eac091 100644 --- a/app/controllers/mailgun_controller.rb +++ b/app/controllers/mailgun_controller.rb @@ -14,7 +14,7 @@ class MailgunController < ApplicationController todo = MessageGateway.receive(params['body-mime']) if todo - render :xml => todo.to_xml( *todo_xml_params ) + render :xml => todo.to_xml(*todo_xml_params) else render_failure "Todo not saved", 406 end diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index ef44c114..5c14d3a0 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -8,7 +8,7 @@ class NotesController < ApplicationController @source_view = 'note_list' respond_to do |format| format.html - format.xml { render :xml => @all_notes.to_xml(:root => :notes, :except => :user_id) } + format.xml { render :xml => @all_notes.to_xml(:root => :notes, :except => :user_id) } end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2c95b993..e116bb08 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -153,7 +153,7 @@ class ProjectsController < ApplicationController else @project_default_context = t('projects.default_context', :context => @project.default_context.name) end - cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } + cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } @mobile_from_project = @project.id end format.xml do @@ -245,7 +245,7 @@ class ProjectsController < ApplicationController respond_to do |format| format.js { render :template => template } - format.html { redirect_to :action => 'index'} + format.html { redirect_to :action => 'index' } format.xml do if @saved render :xml => @project.to_xml(:except => :user_id) diff --git a/app/controllers/recurring_todos/form_helper.rb b/app/controllers/recurring_todos/form_helper.rb index f7bbe962..574478b0 100644 --- a/app/controllers/recurring_todos/form_helper.rb +++ b/app/controllers/recurring_todos/form_helper.rb @@ -39,7 +39,7 @@ module RecurringTodos def method_missing(method, *args) # delegate daily_xxx to daily_pattern, weekly_xxx to weekly_pattern, etc. if method.to_s =~ /^([^_]+)_(.+)$/ - return @method_map[$1][:method].send(@method_map[$1][:prefix]+$2, *args) unless @method_map[$1].nil? + return @method_map[$1][:method].send(@method_map[$1][:prefix] + $2, *args) unless @method_map[$1].nil? end # no match, let @recurring_todo handle it, or fail diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb index 9283459f..1d6ce146 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -18,11 +18,9 @@ class RecurringTodosController < ApplicationController @new_recurring_todo = RecurringTodo.new end - def new - end + def new; end - def show - end + def show; end def done @source_view = params['_source_view'] || 'recurring_todo' @@ -171,7 +169,7 @@ class RecurringTodosController < ApplicationController context_name: :context_name, project_name: :project_name, tag_list: :tag_list - }.each do |target,source| + }.each do |target, source| move_into_recurring_todo_param(params, target, source) end recurring_todo_params @@ -189,14 +187,14 @@ class RecurringTodosController < ApplicationController tag_list: :edit_recurring_todo_tag_list, end_date: :recurring_todo_edit_end_date, start_from: :recurring_todo_edit_start_from - }.each do |target,source| + }.each do |target, source| move_into_recurring_todo_param(params, target, source) end # make sure that we set weekly_return_xxx to empty (space) when they are # not checked (and thus not present in params["recurring_todo"]) %w{monday tuesday wednesday thursday friday saturday sunday}.each do |day| - params["recurring_todo"]["weekly_return_#{day}"]=' ' if params["recurring_todo"]["weekly_return_#{day}"].nil? + params["recurring_todo"]["weekly_return_#{day}"] = ' ' if params["recurring_todo"]["weekly_return_#{day}"].nil? end recurring_todo_params @@ -207,9 +205,15 @@ class RecurringTodosController < ApplicationController end def init - @days_of_week = (0..6).map{|i| [t('date.day_names')[i], i] } - @months_of_year = (1..12).map{|i| [t('date.month_names')[i], i] } - @xth_day = [[t('common.first'),1],[t('common.second'),2],[t('common.third'),3],[t('common.fourth'),4],[t('common.last'),5]] + @days_of_week = (0..6).map { |i| [t('date.day_names')[i], i] } + @months_of_year = (1..12).map { |i| [t('date.month_names')[i], i] } + @xth_day = [ + [t('common.first'), 1], + [t('common.second'), 2], + [t('common.third'), 3], + [t('common.fourth'), 4], + [t('common.last'),5] + ] @projects = current_user.projects.includes(:default_context) @contexts = current_user.contexts end @@ -221,10 +225,10 @@ class RecurringTodosController < ApplicationController def find_and_inactivate # find active recurring todos without active todos and inactivate them - current_user.recurring_todos.active. - select("recurring_todos.id, recurring_todos.state"). - joins("LEFT JOIN todos fai_todos ON (recurring_todos.id = fai_todos.recurring_todo_id) AND (NOT fai_todos.state='completed')"). - where("fai_todos.id IS NULL"). - each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! } + current_user.recurring_todos.active + .select("recurring_todos.id, recurring_todos.state") + .joins("LEFT JOIN todos fai_todos ON (recurring_todos.id = fai_todos.recurring_todo_id) AND (NOT fai_todos.state='completed')") + .where("fai_todos.id IS NULL") + .each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! } end end diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 1a8e6c39..0b6eb748 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -1,5 +1,5 @@ class StatsController < ApplicationController - SECONDS_PER_DAY = 86_400; + SECONDS_PER_DAY = 86_400 helper :todos, :projects, :recurring_todos append_before_action :init, :except => :index @@ -23,15 +23,15 @@ class StatsController < ApplicationController # less than the minimum completed_at, so no reason to check minimum completed_at # convert to array and fill in non-existing months - @actions_done_last_months_array = put_events_into_month_buckets(actions_last_months, month_count+1, :completed_at) - @actions_created_last_months_array = put_events_into_month_buckets(actions_last_months, month_count+1, :created_at) + @actions_done_last_months_array = put_events_into_month_buckets(actions_last_months, month_count + 1, :completed_at) + @actions_created_last_months_array = put_events_into_month_buckets(actions_last_months, month_count + 1, :created_at) # find max for graph in both hashes @max = (@actions_done_last_months_array + @actions_created_last_months_array).max # set running avg - @actions_done_avg_last_months_array = compute_running_avg_array(@actions_done_last_months_array,month_count + 1) - @actions_created_avg_last_months_array = compute_running_avg_array(@actions_created_last_months_array,month_count + 1) + @actions_done_avg_last_months_array = compute_running_avg_array(@actions_done_last_months_array, month_count + 1) + @actions_created_avg_last_months_array = compute_running_avg_array(@actions_created_last_months_array, month_count + 1) # interpolate avg for this month. @interpolated_actions_created_this_month = interpolate_avg_for_current_month(@actions_created_last_months_array) @@ -57,7 +57,7 @@ class StatsController < ApplicationController # last bar of the chart is selected. avtr is used for all other bars week_from = params['index'].to_i - week_to = week_from+1 + week_to = week_from + 1 @chart = Stats::Chart.new('actions_visible_running_time_data') @page_title = t('stats.actions_selected_from_week') @@ -117,7 +117,7 @@ class StatsController < ApplicationController @last_completed_projects = current_user.projects.completed.limit(10).reorder('completed_at DESC').includes(:todos, :notes) @last_completed_contexts = [] @last_completed_recurring_todos = current_user.recurring_todos.completed.limit(10).reorder('completed_at DESC').includes(:tags, :taggings) - #TODO: @last_completed_contexts = current_user.contexts.completed.all(:limit => 10, :order => 'completed_at DESC') + # TODO: @last_completed_contexts = current_user.contexts.completed.all(:limit => 10, :order => 'completed_at DESC') end private @@ -135,7 +135,7 @@ class StatsController < ApplicationController @cut_off_30days = 30.days.ago.beginning_of_day end - def get_ids_from (actions, week_from, week_to, at_end) + def get_ids_from(actions, week_from, week_to, at_end) selected_todo_ids = [] actions.each do |r| diff --git a/app/controllers/todos/todo_create_params_helper.rb b/app/controllers/todos/todo_create_params_helper.rb index 98c22cdb..717bc6a5 100644 --- a/app/controllers/todos/todo_create_params_helper.rb +++ b/app/controllers/todos/todo_create_params_helper.rb @@ -25,7 +25,8 @@ module Todos elsif params[:todo] @attributes = todo_params(params) end - @attributes = {} if @attributes.nil? # make sure there is at least an empty hash + # Make sure there is at least an empty hash + @attributes = {} if @attributes.nil? end def filter_tags @@ -41,7 +42,7 @@ module Todos def filter_starred if @params[:new_todo_starred] - @attributes["starred"] = (@params[:new_todo_starred]||"").include? "true" + @attributes["starred"] = (@params[:new_todo_starred] || "").include? "true" end end @@ -77,7 +78,7 @@ module Todos @params['predecessor_list'] end - def parse_dates() + def parse_dates @attributes['show_from'] = @user.prefs.parse_date(show_from) @attributes['due'] = @user.prefs.parse_date(due) @attributes['due'] ||= '' diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index fae07c27..9c98c88d 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -38,7 +38,7 @@ class TodosController < ApplicationController @page_title = t('todos.task_list_title') # Set count badge to number of not-done, not hidden context items @count = current_user.todos.active.not_hidden.count(:all) - @todos_without_project = @not_done_todos.select{ |t| t.project.nil? } + @todos_without_project = @not_done_todos.select { |t| t.project.nil? } end format.m do @page_title = t('todos.mobile_todos_page_title') @@ -49,14 +49,14 @@ class TodosController < ApplicationController render :action => 'index'.freeze end - format.text do + format.text do # somehow passing Mime[:text] using content_type to render does not work headers['Content-Type'.freeze] = Mime[:text].to_s render :content_type => Mime[:text] end format.xml do @xml_todos = params[:limit_to_active_todos] ? @not_done_todos : @todos - render :xml => @xml_todos.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) + render :xml => @xml_todos.to_xml(*[todo_xml_params[0].merge({ :root => :todos })]) end format.any(:rss, :atom) do @feed_title = 'Tracks Actions'.freeze @@ -70,7 +70,7 @@ class TodosController < ApplicationController @projects = current_user.projects.active @contexts = current_user.contexts respond_to do |format| - format.m { + format.m do @new_mobile = true @return_path = cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path @mobile_from_context = current_user.contexts.find(params[:from_context]) if params[:from_context] @@ -79,7 +79,7 @@ class TodosController < ApplicationController # we have a project but not a context -> use the default context @mobile_from_context = @mobile_from_project.default_context end - } + end end end @@ -174,7 +174,8 @@ class TodosController < ApplicationController # first build all todos and check if they would validate on save params[:todo][:multiple_todos].split("\n").map do |line| - if line.present? #ignore blank lines + # Ignore blank lines + if line.present? @todo = current_user.todos.build({ :description => line, :context_id => p.context_id, :project_id => p.project_id }) validates &&= @todo.valid? @@ -245,12 +246,12 @@ class TodosController < ApplicationController @tag_name = params['_tag_name'] respond_to do |format| format.js - format.m { + format.m do @projects = current_user.projects.active @contexts = current_user.contexts @edit_mobile = true @return_path = cookies[:mobile_url] ? cookies[:mobile_url] : mobile_path - } + end end end @@ -258,7 +259,7 @@ class TodosController < ApplicationController @todo = current_user.todos.find(params['id']) respond_to do |format| format.m { render :action => 'show' } - format.xml { render :xml => @todo.to_xml( *[todo_xml_params[0].merge({ :root => :todo })] ) } + format.xml { render :xml => @todo.to_xml(*[todo_xml_params[0].merge({ :root => :todo })]) } end end @@ -339,7 +340,7 @@ class TodosController < ApplicationController determine_down_count determine_completed_count determine_deferred_tag_count(params['_tag_name']) if source_view_is(:tag) - @wants_redirect_after_complete = @todo.completed? && !@todo.project_id.nil? && current_user.prefs.show_project_on_todo_done && !source_view_is(:project) + @wants_redirect_after_complete = @todo.completed? && !@todo.project_id.nil? && current_user.prefs.show_project_on_todo_done && !source_view_is(:project) if source_view_is :calendar @original_item_due_id = get_due_id_for_calendar(@original_item.due) @old_due_empty = is_old_due_empty(@original_item_due_id) @@ -347,7 +348,7 @@ class TodosController < ApplicationController end render end - format.xml { render :xml => @todo.to_xml( *todo_xml_params ) } + format.xml { render :xml => @todo.to_xml(*todo_xml_params) } format.html do if @saved # TODO: I think this will work, but can't figure out how to test it @@ -355,10 +356,10 @@ class TodosController < ApplicationController redirect_to :action => "index" else notify(:notice, t("todos.action_marked_complete_error", :description => @todo.description, :completed => @todo.completed? ? 'complete' : 'incomplete'), "index") - redirect_to :action => "index" + redirect_to :action => "index" end end - format.m { + format.m do if @saved if cookies[:mobile_url] old_path = cookies[:mobile_url] @@ -372,7 +373,7 @@ class TodosController < ApplicationController else render :action => "edit", :format => :m end - } + end end end @@ -382,9 +383,9 @@ class TodosController < ApplicationController @saved = true # cannot determine error respond_to do |format| format.js - format.xml { render :xml => @todo.to_xml( *todo_xml_params ) } + format.xml { render :xml => @todo.to_xml(*todo_xml_params) } format.html { redirect_to request.referrer } - format.m { + format.m do if cookies[:mobile_url] old_path = cookies[:mobile_url] cookies[:mobile_url] = { :value => nil, :secure => SITE_CONFIG['secure_cookies'] } @@ -394,7 +395,7 @@ class TodosController < ApplicationController notify(:notice, "Star toggled") onsite_redirect_to todos_path(:format => 'm') end - } + end end end @@ -413,7 +414,7 @@ class TodosController < ApplicationController respond_to do |format| format.js { render :action => :update } - format.xml { render :xml => @todo.to_xml( *todo_xml_params ) } + format.xml { render :xml => @todo.to_xml(*todo_xml_params) } end end @@ -437,7 +438,7 @@ class TodosController < ApplicationController rescue ActiveRecord::RecordInvalid => exception record = exception.record if record.is_a?(Dependency) - record.errors.each { |key,value| @todo.errors[key] << value } + record.errors.each { |key, value| @todo.errors[key] << value } end @saved = false end @@ -462,12 +463,12 @@ class TodosController < ApplicationController @todo.touch_predecessors if @original_item.description != @todo.description respond_to do |format| - format.js { + format.js do @status_message = @todo.deferred? ? t('todos.action_saved_to_tickler') : t('todos.action_saved') @status_message = t('todos.added_new_project') + ' / ' + @status_message if @new_project_created @status_message = t('todos.added_new_context') + ' / ' + @status_message if @new_context_created - } - format.xml { render :xml => @todo.to_xml( *todo_xml_params ) } + end + format.xml { render :xml => @todo.to_xml(*todo_xml_params) } format.m do if @saved do_mobile_todo_redirection @@ -490,7 +491,8 @@ class TodosController < ApplicationController def destroy @source_view = params['_source_view'] || 'todo' @todo = current_user.todos.find(params['id']) - @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo + # Create a (unsaved) copy of the original todo + @original_item = current_user.todos.build(@todo.attributes) @context_id = @todo.context_id @project_id = @todo.project_id @todo_was_destroyed = true @@ -558,7 +560,7 @@ class TodosController < ApplicationController format.html format.xml do completed_todos = current_user.todos.completed - render :xml => completed_todos.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) + render :xml => completed_todos.to_xml(*[todo_xml_params[0].merge({ :root => :todos })]) end end end @@ -581,7 +583,7 @@ class TodosController < ApplicationController includes = params[:format] == 'xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES @not_done_todos = current_user.todos.deferred.includes(includes).reorder('show_from') + current_user.todos.pending.includes(includes) - @todos_without_project = @not_done_todos.select{|t|t.project.nil?} + @todos_without_project = @not_done_todos.select { |t| t.project.nil? } @down_count = @count = @not_done_todos.size respond_to do |format| @@ -591,7 +593,7 @@ class TodosController < ApplicationController init_data_for_sidebar unless mobile? end format.m - format.xml { render :xml => @not_done_todos.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } + format.xml { render :xml => @not_done_todos.to_xml(*[todo_xml_params[0].merge({ :root => :todos })]) } end end @@ -625,23 +627,23 @@ class TodosController < ApplicationController todos_with_tag_ids = find_todos_with_tag_expr(@tag_expr) - @not_done_todos = todos_with_tag_ids. - active.not_hidden. - reorder(Arel.sql('todos.due IS NULL, todos.due ASC, todos.created_at ASC')). - includes(Todo::DEFAULT_INCLUDES) - @hidden_todos = todos_with_tag_ids. - hidden. - reorder(Arel.sql('todos.completed_at DESC, todos.created_at DESC')). - includes(Todo::DEFAULT_INCLUDES) - @deferred_todos = todos_with_tag_ids. - deferred. - reorder(Arel.sql('todos.show_from ASC, todos.created_at DESC')). - includes(Todo::DEFAULT_INCLUDES) - @pending_todos = todos_with_tag_ids. - blocked. - reorder(Arel.sql('todos.show_from ASC, todos.created_at DESC')). - includes(Todo::DEFAULT_INCLUDES) - @todos_without_project = @not_done_todos.select{ |t| t.project.nil? } + @not_done_todos = todos_with_tag_ids + .active.not_hidden + .reorder(Arel.sql('todos.due IS NULL, todos.due ASC, todos.created_at ASC')) + .includes(Todo::DEFAULT_INCLUDES) + @hidden_todos = todos_with_tag_ids + .hidden + .reorder(Arel.sql('todos.completed_at DESC, todos.created_at DESC')) + .includes(Todo::DEFAULT_INCLUDES) + @deferred_todos = todos_with_tag_ids + .deferred + .reorder(Arel.sql('todos.show_from ASC, todos.created_at DESC')) + .includes(Todo::DEFAULT_INCLUDES) + @pending_todos = todos_with_tag_ids + .blocked + .reorder(Arel.sql('todos.show_from ASC, todos.created_at DESC')) + .includes(Todo::DEFAULT_INCLUDES) + @todos_without_project = @not_done_todos.select { |t| t.project.nil? } # If you've set no_completed to zero, the completed items box isn't shown on # the tag page @@ -664,12 +666,8 @@ class TodosController < ApplicationController respond_to do |format| format.html - format.m { - cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } - } - format.text { - render :action => 'index', :layout => false, :content_type => Mime[:text] - } + format.m { cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } } + format.text { render :action => 'index', :layout => false, :content_type => Mime[:text] } end end @@ -706,7 +704,7 @@ class TodosController < ApplicationController tags_all -= tags_beginning respond_to do |format| - format.autocomplete { render :body => for_autocomplete(tags_beginning+tags_all, params[:term]) } + format.autocomplete { render :body => for_autocomplete(tags_beginning + tags_all, params[:term]) } end end @@ -715,7 +713,8 @@ class TodosController < ApplicationController numdays = params['days'].to_i @todo = current_user.todos.find(params[:id]) - @original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo + # Create a (unsaved) copy of the original todo + @original_item = current_user.todos.build(@todo.attributes) @todo_deferred_state_changed = true @new_context_created = false @@ -750,7 +749,7 @@ class TodosController < ApplicationController def list_hidden @hidden = current_user.todos.hidden respond_to do |format| - format.xml { render :xml => @hidden.to_xml( *[todo_xml_params[0].merge({ :root => :todos })] ) } + format.xml { render :xml => @hidden.to_xml(*[todo_xml_params[0].merge({ :root => :todos })]) } end end @@ -843,7 +842,7 @@ class TodosController < ApplicationController end def tag_title(tag_expr) - and_list = tag_expr.inject([]) { |s,tag_list| s << tag_list.join(',') } + and_list = tag_expr.inject([]) { |s, tag_list| s << tag_list.join(',') } return and_list.join(' AND ') end @@ -905,7 +904,7 @@ end end def find_todos_with_tag_expr(tag_expr) - # optimize for the common case: selecting only one tag + # Optimize for the common case of selecting only one tag if @single_tag tag = current_user.tags.where(:name => @tag_name).first tag_id = tag.nil? ? -1 : tag.id @@ -1184,7 +1183,8 @@ end def update_tags if params[:tag_list] @todo.tag_with(params[:tag_list]) - @todo.tags.reload #force a reload for proper rendering + # Force a reload for proper rendering + @todo.tags.reload end end @@ -1197,7 +1197,7 @@ end end def update_date_for_update(key) - params['todo'][key] = params["todo"].has_key?(key) ? parse_date_for_update(params["todo"][key], t("todos.error.invalid_#{key}_date")) : "" + params['todo'][key] = params["todo"].key?(key) ? parse_date_for_update(params["todo"][key], t("todos.error.invalid_#{key}_date")) : "" end def update_due_and_show_from_dates @@ -1225,7 +1225,7 @@ end # assumes @todo.save was called so that the predecessor_list is persistent original_item_predecessor_list = @original_item.predecessors - .map{ |t| t.specification } + .map { |t| t.specification } .join(', ') if original_item_predecessor_list != params[:predecessor_list] diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 54aa94f2..8198025a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -92,12 +92,12 @@ class UsersController < ApplicationController return end - signup_by_admin = true if (@user && @user.is_admin?) + signup_by_admin = true if @user && @user.is_admin? first_user_signing_up = User.no_users_yet? user.is_admin = true if first_user_signing_up if user.save @user = User.authenticate(user.login, params['user']['password']) - @user.create_preference({ :locale => I18n.locale }) + @user.create_preference(:locale => I18n.locale) @user.save session['user_id'] = @user.id unless signup_by_admin notify :notice, t('users.signup_successful', :username => @user.login) @@ -219,10 +219,10 @@ class UsersController < ApplicationController end def check_create_user_params - return false unless params.has_key?(:user) - return false unless params[:user].has_key?(:login) + return false unless params.key?(:user) + return false unless params[:user].key?(:login) return false if params[:user][:login].empty? - return false unless params[:user].has_key?(:password) + return false unless params[:user].key?(:password) return false if params[:user][:password].empty? return true end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a3a0d3d2..7a5856c3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -10,7 +10,7 @@ module ApplicationHelper link_to( t("layouts.navigation.group_view_by_#{menu_name}"), '#', - { :id => "group_view_by_link", :accesskey => "g", :title => t('layouts.navigation.group_view_by_title'), :x_current_group_by => @group_view_by } ) + { :id => "group_view_by_link", :accesskey => "g", :title => t('layouts.navigation.group_view_by_title'), :x_current_group_by => @group_view_by }) end end @@ -44,7 +44,7 @@ module ApplicationHelper end def count_undone_todos_phrase_text(todos_parent) - count_undone_todos_phrase(todos_parent).gsub(" "," ").html_safe + count_undone_todos_phrase(todos_parent).gsub(" ", " ").html_safe end def count_undone_todos_and_notes_phrase(project) @@ -113,7 +113,7 @@ module ApplicationHelper recurring_target + recurrence_pattern + recurrence_time_span end - def date_format_for_date_picker() + def date_format_for_date_picker [ ['%m', 'mm'], ['%b', 'M'], @@ -126,8 +126,8 @@ module ApplicationHelper ].inject(current_user.prefs.date_format) { |str, translation| str.gsub(*translation) } end - def sidebar_html_for_titled_list (list, title) - return content_tag(:h3, title+" (#{list.size})") + content_tag(:ul, sidebar_html_for_list(list)) + def sidebar_html_for_titled_list(list, title) + return content_tag(:h3, title + " (#{list.size})") + content_tag(:ul, sidebar_html_for_list(list)) end def link_to_sidebar_item(item) @@ -159,7 +159,7 @@ module ApplicationHelper common.update common.create common.ajaxError todos.unresolved_dependency }.each do |s| - js << "i18n['#{s}'] = '#{ t(s).gsub(/'/, "\\\\'") }';\n" + js << "i18n['#{s}'] = '#{t(s).gsub(/'/, "\\\\'")}';\n" end return js.html_safe end @@ -219,7 +219,7 @@ module ApplicationHelper end def link_to_edit(type, object, descriptor) - link_to(descriptor, self.send("edit_#{type}_path", object), + link_to(descriptor, send("edit_#{type}_path", object), { :id => "link_edit_#{dom_id(object)}", :class => "#{type}_edit_settings icon" diff --git a/app/helpers/bootstrap_flash_helper.rb b/app/helpers/bootstrap_flash_helper.rb index 04ea47bf..85d3ca3d 100644 --- a/app/helpers/bootstrap_flash_helper.rb +++ b/app/helpers/bootstrap_flash_helper.rb @@ -5,9 +5,9 @@ module BootstrapFlashHelper :error => :danger, :info => :info, :warning => :warning - } unless const_defined?(:ALERT_MAPPING) + }.freeze unless const_defined?(:ALERT_MAPPING) - def bootstrap_flash(options = {:close_button => true}) + def bootstrap_flash(options = { :close_button => true }) flash_messages = [] flash.each do |type, message| # Skip empty messages, e.g. for devise messages set to nothing in a locale file. @@ -15,7 +15,6 @@ module BootstrapFlashHelper type = type.to_sym next unless ALERT_MAPPING.keys.include?(type) - tag_class = options.extract!(:class)[:class] tag_options = { class: "alert fade in alert-#{ALERT_MAPPING[type]} #{tag_class}" diff --git a/app/helpers/contexts_helper.rb b/app/helpers/contexts_helper.rb index 472b968b..edb53116 100644 --- a/app/helpers/contexts_helper.rb +++ b/app/helpers/contexts_helper.rb @@ -1,9 +1,9 @@ module ContextsHelper def show_context_name(context) if source_view_is :context - content_tag(:span, :id => "context_name"){context.name} + content_tag(:span, :id => "context_name"){ context.name } else - link_to_context( context ) + link_to_context(context) end end @@ -11,7 +11,7 @@ module ContextsHelper link_to_delete(:context, context, descriptor) end - def link_to_edit_context (context, descriptor = sanitize(context.name)) + def link_to_edit_context(context, descriptor = sanitize(context.name)) link_to_edit(:context, context, descriptor) end diff --git a/app/helpers/date_label_helper.rb b/app/helpers/date_label_helper.rb index 68b5435c..464c794e 100644 --- a/app/helpers/date_label_helper.rb +++ b/app/helpers/date_label_helper.rb @@ -10,7 +10,7 @@ module DateLabelHelper :tomorrow => :amber, :this_week => :orange, :more_than_a_week => :green - } + }.freeze def initialize(date, prefs) @date = date @@ -51,19 +51,15 @@ module DateLabelHelper def date_html_wrapper return "" if @date.nil? - return content_tag(:a, {:title => @prefs.format_date(@date)}) { - content_tag(:span, {:class => get_color}) { - yield - } + return content_tag(:a, { :title => @prefs.format_date(@date) }) { + content_tag(:span, { :class => get_color }) { yield } } end def date_mobile_html_wrapper return "" if @date.nil? - return content_tag(:span, {:class => get_color}) { - yield - } + return content_tag(:span, { :class => get_color }) { yield } end end diff --git a/app/helpers/feedlist_helper.rb b/app/helpers/feedlist_helper.rb index 4a912a83..70f0a904 100644 --- a/app/helpers/feedlist_helper.rb +++ b/app/helpers/feedlist_helper.rb @@ -1,6 +1,6 @@ module FeedlistHelper def linkoptions(format, options) - merge_hashes( { :format => format }, options, user_token_hash) + merge_hashes({ :format => format }, options, user_token_hash) end def rss_formatted_link(options = {}) @@ -41,7 +41,7 @@ module FeedlistHelper protected def merge_hashes(*hashes) - hashes.inject(Hash.new){ |result, h| result.merge(h) } + hashes.inject({}) { |result, h| result.merge(h) } end def user_token_hash diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 0e62f5a4..9d046098 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -11,9 +11,8 @@ module NotesHelper link_to( descriptor, note_path(note, :format => 'js'), - {:id => "delete_note_#{note.id}", :class => "delete_note_button", - :title => t('notes.delete_note_title', :id => note.id), :x_confirm_message => t('notes.delete_note_confirm', :id => note.id)} + { :id => "delete_note_#{note.id}", :class => "delete_note_button", + :title => t('notes.delete_note_title', :id => note.id), :x_confirm_message => t('notes.delete_note_confirm', :id => note.id) } ) end - end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 2ce15824..bd2e6ada 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -1,9 +1,9 @@ module ProjectsHelper def show_project_name(project) if source_view_is :project - content_tag(:span, :id => "project_name"){project.name} + content_tag(:span, :id => "project_name") { project.name } else - link_to_project( project ) + link_to_project(project) end end @@ -14,7 +14,7 @@ module ProjectsHelper end def project_next_prev - content_tag(:div, :id=>"project-next-prev") do + content_tag(:div, :id => "project-next-prev") do html = "" html << link_to_project(@previous_project, "« #{@previous_project.shortened_name}".html_safe) if @previous_project html << " | " if @previous_project && @next_project @@ -33,14 +33,13 @@ module ProjectsHelper def project_summary(project) project_description = '' - project_description += render_text( project.description ) if project.description.present? + project_description += render_text(project.description) if project.description.present? project_description += content_tag(:p, - "#{count_undone_todos_phrase(p)}. #{t('projects.project_state', :state => project.state)}".html_safe - ) + "#{count_undone_todos_phrase(p)}. #{t('projects.project_state', :state => project.state)}".html_safe) end def needsreview_class(item) - raise "item must be a Project " unless item.kind_of? Project + raise "item must be a Project " unless item.is_a? Project return item.needs_review?(current_user) ? "needsreview" : "needsnoreview" end @@ -48,7 +47,7 @@ module ProjectsHelper link_to_delete(:project, project, descriptor) end - def link_to_edit_project (project, descriptor = sanitize(project.name)) + def link_to_edit_project(project, descriptor = sanitize(project.name)) link_to_edit(:project, project, descriptor) end end diff --git a/app/helpers/recurring_todos_helper.rb b/app/helpers/recurring_todos_helper.rb index 7f6fe459..895f02cb 100644 --- a/app/helpers/recurring_todos_helper.rb +++ b/app/helpers/recurring_todos_helper.rb @@ -1,8 +1,8 @@ module RecurringTodosHelper def recurring_todo_tag_list - tags_except_starred = @recurring_todo.tags.reject{ |t| t.name == Todo::STARRED_TAG_NAME } + tags_except_starred = @recurring_todo.tags.reject { |t| t.name == Todo::STARRED_TAG_NAME } tag_list = tags_except_starred - .collect{ |t| content_tag(:span,link_to(t.name, tag_path(t.name)), :class => "tag #{t.label}") } + .collect { |t| content_tag(:span, link_to(t.name, tag_path(t.name)), :class => "tag #{t.label}") } .join('') return content_tag :span, tag_list.html_safe, :class => "tags" end diff --git a/app/helpers/rendering_helper.rb b/app/helpers/rendering_helper.rb index 56f304d0..ad406aa6 100644 --- a/app/helpers/rendering_helper.rb +++ b/app/helpers/rendering_helper.rb @@ -21,7 +21,7 @@ module RenderingHelper def render_text(text) rendered = auto_link_message(text) rendered = textile(rendered) - rendered = auto_link(rendered, link: :urls, html: {target: '_blank'}) + rendered = auto_link(rendered, link: :urls, html: { target: '_blank' }) relaxed_config = Sanitize::Config::RELAXED config = relaxed_config diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 6e9f7d8f..3f74747e 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -3,17 +3,17 @@ require 'staleness' module TodosHelper # === helpers for rendering container def empty_message_holder(container_name, show, title_param = nil) - content_tag(:div, :id => "no_todos_in_view", :class => "container #{container_name}", :style => "display:" + (show ? "block" : "none") ) do - content_tag(:h2) { t("todos.no_actions.title", :param=>title_param) } + + content_tag(:div, :id => "no_todos_in_view", :class => "container #{container_name}", :style => "display:" + (show ? "block" : "none")) do + content_tag(:h2) { t("todos.no_actions.title", :param => title_param) } + content_tag(:div, :class => "message") do - content_tag(:p) { t("todos.no_actions.#{container_name}", :param=>title_param) } + content_tag(:p) { t("todos.no_actions.#{container_name}", :param => title_param) } end end end def todos_container_empty_message(container_name, container_id, show_message) content_tag(:div, :id => "#{container_id}-empty-d", :style => "display:#{show_message ? 'block' : 'none'}") do - content_tag(:div, :class=>"message") do + content_tag(:div, :class => "message") do content_tag(:p) do t("todos.no_actions.#{container_name}") end @@ -27,7 +27,7 @@ module TodosHelper :collapsible => true, :show_empty_containers => @show_empty_containers, :parent_container_type => @group_view_by - })}) + }) }) end def default_collection_settings @@ -73,10 +73,10 @@ module TodosHelper def show_deferred_pending_todos(deferred_todos, pending_todos, settings = {}) settings[:pending] = pending_todos - settings[:container_name]="deferred_pending" + settings[:container_name] = "deferred_pending" render :partial => "todos/collection", - :object => deferred_todos+pending_todos, + :object => deferred_todos + pending_todos, :locals => { :settings => settings.reverse_merge!(default_collection_settings) } end @@ -113,7 +113,7 @@ module TodosHelper settings.reverse_merge!({ :title => t("todos.actions.#{settings[:parent_container_type]}_#{settings[:container_name]}", :param => settings[:title_param]) }) - header = settings[:link_in_header].nil? ? "" : content_tag(:div, :class=>"link_in_container_header"){settings[:link_in_header]} + header = settings[:link_in_header].nil? ? "" : content_tag(:div, :class => "link_in_container_header") { settings[:link_in_header] } header += content_tag(:h2) do toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : "" "#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe @@ -123,7 +123,7 @@ module TodosHelper end def todos_container_items(collection, settings = {}) - settings.reverse_merge!({:id => "#{settings[:container_name]}"}) + settings.reverse_merge!({ :id => "#{settings[:container_name]}" }) # do not pass :class to partial locals settings.delete(:class) @@ -140,7 +140,7 @@ module TodosHelper :collapsible => false, :show_empty_containers => true, :container_name => "#{period}", - :title =>t("todos.calendar.#{period}", :month => l(Time.zone.now, :format => "%B"), :next_month => l(1.month.from_now, :format => "%B")) + :title => t("todos.calendar.#{period}", :month => l(Time.zone.now, :format => "%B"), :next_month => l(1.month.from_now, :format => "%B")) } } end @@ -168,12 +168,13 @@ module TodosHelper :class => "icon_delete_item", :id => dom_id(todo, "delete"), :x_confirm_message => t('todos.confirm_delete', :description => todo.description), - :title => t('todos.delete_action')); + :title => t('todos.delete_action') + ) end def remote_defer_menu_item(days, todo) url = { :controller => 'todos', :action => 'defer', :id => todo.id, :days => days, - :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "") } + :_source_view => (@source_view.underscore.gsub(/\s+/, '_') rescue "") } url[:_tag_name] = @tag_name if @source_view == 'tag' options = { :x_defer_alert => false, :class => "icon_defer_item icon_defer_#{days}_item", :id => "defer_#{days}_#{dom_id(todo)}" } @@ -192,13 +193,13 @@ module TodosHelper link_to( image_tag("blank.png", :title => t('todos.remove_dependency'), :align => "absmiddle", :class => "delete_item"), remove_predecessor_todo_path(todo), - {:class => "delete_dependency_button", :x_predecessors_id => predecessor.id} + { :class => "delete_dependency_button", :x_predecessors_id => predecessor.id } ) end def remote_promote_to_project_menu_item(todo) - url = {:controller => 'todos', :action => 'convert_to_project', :id => todo.id, - :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")} + url = { :controller => 'todos', :action => 'convert_to_project', :id => todo.id, + :_source_view => (@source_view.underscore.gsub(/\s+/, '_') rescue "") } url[:_tag_name] = @tag_name if @source_view == 'tag' link_to(t('todos.convert_to_project'), url, { :class => "icon_item_to_project", :id => dom_id(todo, "to_project") }) @@ -206,7 +207,7 @@ module TodosHelper def attachment_image(todo) link_to( - image_tag('blank.png', width: 16, height: 16, border:0), + image_tag('blank.png', width: 16, height: 16, border: 0), todo.attachments.first.file.url, { :class => 'todo_attachment', title: 'Get attachments of this todo' } ) @@ -214,23 +215,23 @@ module TodosHelper def collapsed_notes_image(todo) link = link_to( - image_tag( 'blank.png', :width => '16', :height => '16', :border => '0' ), + image_tag('blank.png', :width => '16', :height => '16', :border => '0'), "#", { :class => 'show_notes', :title => 'Show notes' }) notes = content_tag(:div, { :class => "todo_notes", :id => dom_id(todo, 'notes'), :style => "display:none" }) { raw render_text(todo.notes) } - return link+notes + return link + notes end def collapsed_successors_image(todo) - link = link_to(image_tag('blank.png', :width => '16', :height => '16', :border => '0' ), "#", { :class => 'show_successors', :title => 'Show successors' }) + link = link_to(image_tag('blank.png', :width => '16', :height => '16', :border => '0'), "#", { :class => 'show_successors', :title => 'Show successors' }) successors = content_tag(:div, { :class => "todo_successors", :id => dom_id(todo, 'successors'), :style => "display:none" }) do render :partial => "todos/successor", :collection => todo.pending_successors, :locals => { :parent_container_type => parent_container_type, :suppress_dependencies => true, :predecessor => todo } end - return link+successors + return link + successors end def image_tag_for_recurring_todo(todo) @@ -257,9 +258,9 @@ module TodosHelper def date_span(todo = @todo) if todo.completed? - content_tag(:span, { :class => :grey }) { format_date( todo.completed_at ) } + content_tag(:span, { :class => :grey }) { format_date(todo.completed_at) } elsif todo.pending? - title = t('todos.depends_on')+ ": " + todo.uncompleted_predecessors.to_a.map(&:description).join(', ') + title = t('todos.depends_on') + ": " + todo.uncompleted_predecessors.to_a.map(&:description).join(', ') content_tag(:a, { :title => title }) { content_tag(:span, { :class => :orange }) { t('todos.pending') } } elsif todo.deferred? show_date(todo.show_from) @@ -318,7 +319,7 @@ module TodosHelper end def include_context_link(todo, parent_container_type) - return true if (['stats', 'search'].include?(parent_container_type)) + return true if ['stats', 'search'].include?(parent_container_type) # TODO: remove next line if 'project' supports group_view_by return true if parent_container_type == 'project' return true if @group_view_by == 'project' @@ -327,7 +328,7 @@ module TodosHelper def include_project_link(todo, parent_container_type) return false unless todo.has_project? - return true if (['stats', 'search'].include?(parent_container_type)) + return true if ['stats', 'search'].include?(parent_container_type) # TODO: remove next line if 'context' supports group_view_by return true if parent_container_type == 'context' return true if @group_view_by == 'context' @@ -347,9 +348,9 @@ module TodosHelper case days_stale when 0...start "" - when start...start*2 + when start...start * 2 " stale_l1" - when start*2...start*3 + when start*2...start * 3 " stale_l2" else " stale_l3" @@ -380,19 +381,19 @@ module TodosHelper def default_contexts_for_autocomplete projects = current_user.projects.uncompleted.includes(:default_context).where('NOT(default_context_id IS NULL)') - Hash[*projects.map{ |p| [escape_javascript(p.name), escape_javascript(p.default_context.name)] }.flatten].to_json + Hash[*projects.map { |p| [escape_javascript(p.name), escape_javascript(p.default_context.name)] }.flatten].to_json end def default_tags_for_autocomplete projects = current_user.projects.uncompleted.where("NOT(default_tags = '')") - Hash[*projects.map{ |p| [escape_javascript(p.name), p.default_tags] }.flatten].to_json + Hash[*projects.map { |p| [escape_javascript(p.name), p.default_tags] }.flatten].to_json end # === various helpers def formatted_pagination(total) s = will_paginate(@todos) - (s.gsub(/(<\/[^<]+>)/, '\1 ')).chomp(' ') + s.gsub(/(<\/[^<]+>)/, '\1 ').chomp(' ') end def format_ical_notes(notes) @@ -418,10 +419,11 @@ module TodosHelper # if the animation needs to be run inside the namespace of an object, set the # object_name to the name of the object and this name will be prepended to each step def render_animation(animation, object_name = nil) - object_name += "." unless object_name.nil? # add dot if object_name is given + # Add dot if object_name is given + object_name += "." unless object_name.nil? # concatenate all steps into functions that call functions - html = animation.map{ |step| "#{object_name}#{step}({ go: function() {" }.join("\r\n") + html = animation.map { |step| "#{object_name}#{step}({ go: function() {" }.join("\r\n") # close all functions html += "}}) " * animation.size + ";" @@ -474,8 +476,8 @@ module TodosHelper end def todo_container_is_empty - default_container_empty = ( @down_count == 0 ) - deferred_container_empty = ( @todo.deferred? && @remaining_deferred_count == 0) + default_container_empty = (@down_count == 0) + deferred_container_empty = (@todo.deferred? && @remaining_deferred_count == 0) return default_container_empty || deferred_container_empty end @@ -516,12 +518,12 @@ module TodosHelper def update_needs_to_remove_todo_from_container source_view do |page| page.context { return @context_changed || @todo_deferred_state_changed || @todo_pending_state_changed || @todo_should_be_hidden } - page.project { return @context_changed || @todo_deferred_state_changed || @todo_pending_state_changed || @project_changed} + page.project { return @context_changed || @todo_deferred_state_changed || @todo_pending_state_changed || @project_changed } page.deferred { return todo_moved_out_of_container || !(@todo.deferred? || @todo.pending?) } page.calendar { return @due_date_changed || !@todo.due } page.stats { return @todo.completed? } - page.tag { return ( (@context_changed | @project_changed) && !@todo.hidden?) || @tag_was_removed || @todo_hidden_state_changed || @todo_deferred_state_changed } - page.todo { return todo_moved_out_of_container || @todo.hidden? || @todo.deferred? || @todo.pending?} + page.tag { return ((@context_changed | @project_changed) && !@todo.hidden?) || @tag_was_removed || @todo_hidden_state_changed || @todo_deferred_state_changed } + page.todo { return todo_moved_out_of_container || @todo.hidden? || @todo.deferred? || @todo.pending? } page.search { return false } end return false @@ -564,7 +566,7 @@ module TodosHelper source_view do |page| page.context { return @remaining_in_context == 0 } end - return @down_count==0 + return @down_count == 0 end def project_container_id(todo) @@ -609,29 +611,25 @@ module TodosHelper raise Exception.new, "no @todo or @successor set" if !todo source_view do |page| - page.project { + page.project do return "deferred_pending_container-empty-d" if empty_criteria_met return todo_container_empty_id(todo) - } - page.tag { + end + page.tag do return "deferred_pending_container-empty-d" if empty_criteria_met return "hidden_container-empty-d" if @todo.hidden? return todo_container_empty_id(todo) - } - page.calendar { + end + page.calendar do return "deferred_pending_container-empty-d" if empty_criteria_met return "#{@new_due_id}_container-empty-d" - } - page.context { + end + page.context do return "deferred_pending_container-empty-d" if empty_criteria_met return todo_container_empty_id(todo) - } - page.todo { - return todo_container_empty_id(todo) - } - page.deferred { - return todo_container_empty_id(todo) - } + end + page.todo { return todo_container_empty_id(todo) } + page.deferred { return todo_container_empty_id(todo) } end return context_container_empty_id(todo) @@ -656,28 +654,28 @@ module TodosHelper def show_empty_message_in_source_container container_id = "" source_view do |page| - page.project { + page.deferred { container_id = todo_container_empty_id(@original_item) if @remaining_in_context == 0 } + page.calendar { container_id = "#{@original_item_due_id}_container-empty-d" if @old_due_empty } + 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 } + page.project do container_id = project_container_empty_id(@original_item) if @remaining_in_context == 0 container_id = "deferred_pending_container-empty-d" if todo_was_removed_from_deferred_or_blocked_container && @remaining_deferred_or_pending_count == 0 container_id = "completed_container-empty-d" if @completed_count && @completed_count == 0 && !@todo.completed? - } - page.deferred { container_id = todo_container_empty_id(@original_item) if @remaining_in_context == 0 } - page.calendar { container_id = "#{@original_item_due_id}_container-empty-d" if @old_due_empty } - page.tag { + end + page.tag do container_id = "hidden_container-empty-d" if (@remaining_hidden_count == 0 && !@todo.hidden? && @todo_hidden_state_changed) || (@remaining_hidden_count == 0 && @todo.completed? && @original_item.hidden?) container_id = "deferred_pending_container-empty-d" if (todo_was_removed_from_deferred_or_blocked_container && @remaining_deferred_or_pending_count == 0) || (@original_item.deferred? && @remaining_deferred_or_pending_count == 0 && (@todo.completed? || @tag_was_removed)) container_id = "completed_container-empty-d" if @completed_count && @completed_count == 0 && !@todo.completed? - } - page.context { + end + page.context do container_id = context_container_empty_id(@original_item) if @remaining_in_context == 0 container_id = "deferred_pending_container-empty-d" if todo_was_removed_from_deferred_or_blocked_container && @remaining_deferred_or_pending_count == 0 container_id = "completed_container-empty-d" if @completed_count && @completed_count == 0 && !@todo.completed? - } - 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 end return container_id.blank? ? "" : "$(\"##{container_id}\").slideDown(100);".html_safe end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 8fdbf5ed..0154872c 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -2,11 +2,12 @@ module UsersHelper def remote_delete_user(user) return link_to( image_tag("blank.png", :title => t('users.destroy_user'), :class => "delete_item"), - url_for({:controller => 'users', :action => 'destroy', :id => user.id}), - { :id => "delete_user_#{user.id}", + url_for(:controller => 'users', :action => 'destroy', :id => user.id), { + :id => "delete_user_#{user.id}", :class => "delete_user_button", :title => t('users.destroy_user'), :x_confirm_message => t('users.destroy_confirmation', :login => user.login) - }) + } + ) end end diff --git a/app/models/context.rb b/app/models/context.rb index 407f15e9..d2594f66 100644 --- a/app/models/context.rb +++ b/app/models/context.rb @@ -31,9 +31,7 @@ class Context < ApplicationRecord end end - validates_presence_of :name, :message => "context must have a name" - validates_length_of :name, :maximum => 255, :message => "context name must be less than 256 characters" - validates_uniqueness_of :name, :message => "already exists", :scope => "user_id", :case_sensitive => false + validates :name, presence: { message: "context must have a name" }, length: { maximum: 255, message: "context name must be less than 256 characters" }, uniqueness: { message: "already exists", scope: "user_id", case_sensitive: false } def self.null_object NullContext.new diff --git a/app/models/message_gateway.rb b/app/models/message_gateway.rb index 38278297..711e6a92 100644 --- a/app/models/message_gateway.rb +++ b/app/models/message_gateway.rb @@ -75,7 +75,7 @@ class MessageGateway < ActionMailer::Base def get_receiving_user_from_mail_header(email) user = get_receiving_user_from_sms_email(get_address(email)) - Rails.logger.info(user.nil? ? "User unknown": "Email belongs to #{user.login}") + Rails.logger.info(user.nil? ? "User unknown" : "Email belongs to #{user.login}") return user end @@ -98,8 +98,8 @@ class MessageGateway < ActionMailer::Base return true end - def sender_is_in_mailmap?(user,email) - if SITE_CONFIG['mailmap'].is_a? Hash and SITE_CONFIG['email_dispatch'] == 'to' + def sender_is_in_mailmap?(user, email) + if (SITE_CONFIG['mailmap'].is_a? Hash) && SITE_CONFIG['email_dispatch'] == 'to' # Look for the sender in the map of allowed senders SITE_CONFIG['mailmap'][user.preference.sms_email].include? email.from[0] else diff --git a/app/models/project.rb b/app/models/project.rb index 0820f10f..6e965a52 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -16,9 +16,7 @@ class Project < ApplicationRecord before_create :set_last_reviewed_now - validates_presence_of :name - validates_length_of :name, :maximum => 255 - validates_uniqueness_of :name, :scope => "user_id", :case_sensitive => true + validates :name, presence: true, length: { maximum: 255 }, uniqueness: { scope: :user_id } acts_as_list :scope => 'user_id = #{user_id} AND state = \'#{state}\'', :top_of_list => 0 @@ -88,21 +86,21 @@ class Project < ApplicationRecord end def needs_review?(user) - return active? && ( last_reviewed.nil? || + return active? && (last_reviewed.nil? || (last_reviewed < Time.current - user.prefs.review_period.days)) end def blocked? ## mutually exclusive for stalled and blocked # blocked is uncompleted project with deferred or pending todos, but no next actions - return false if self.completed? - return !self.todos.deferred_or_blocked.empty? && self.todos.active.empty? + return false if completed? + return !todos.deferred_or_blocked.empty? && todos.active.empty? end def stalled? # Stalled projects are active projects with no active next actions - return false if self.completed? || self.hidden? - return !self.todos.deferred_or_blocked.exists? && !self.todos.active.exists? + return false if completed? || hidden? + return !todos.deferred_or_blocked.exists? && !todos.active.exists? end def shortened_name(length = 40) diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb index 0816a48c..70d1a498 100644 --- a/app/models/recurring_todo.rb +++ b/app/models/recurring_todo.rb @@ -24,10 +24,12 @@ class RecurringTodo < ApplicationRecord end end - validates_presence_of :description, :recurring_period, :target, :ends_on, :context - - validates_length_of :description, :maximum => 100 - validates_length_of :notes, :maximum => 60_000, :allow_nil => true + validates :description, presence: true, length: { maximum: 100 } + validates :notes, length: { maximum: 60_000, allow_nil: true } + validates :recurring_period, presence: true + validates :target, presence: true + validates :ends_on, presence: true + validates :context, presence: true validate :period_validation validate :pattern_specific_validations @@ -118,12 +120,12 @@ class RecurringTodo < ApplicationRecord def remove_from_project! self.project = nil - self.save + save end def clear_todos_association unless todos.nil? - self.todos.each do |t| + todos.each do |t| t.recurring_todo = nil t.save end @@ -132,7 +134,7 @@ class RecurringTodo < ApplicationRecord def increment_occurrences self.occurrences_count += 1 - self.save + save end def continues_recurring?(previous) diff --git a/app/models/recurring_todos/abstract_recurrence_pattern.rb b/app/models/recurring_todos/abstract_recurrence_pattern.rb index 3e5d016d..91276f2e 100644 --- a/app/models/recurring_todos/abstract_recurrence_pattern.rb +++ b/app/models/recurring_todos/abstract_recurrence_pattern.rb @@ -158,13 +158,13 @@ module RecurringTodos def continues_recurring?(previous) return @recurring_todo.occurrences_count < @recurring_todo.number_of_occurrences unless @recurring_todo.number_of_occurrences.nil? - return true if self.end_date.nil? || self.ends_on == 'no_end_date' + return true if end_date.nil? || ends_on == 'no_end_date' - case self.target + case target when 'due_date' - get_due_date(previous) <= self.end_date + get_due_date(previous) <= end_date when 'show_from_date' - get_show_from_date(previous) <= self.end_date + get_show_from_date(previous) <= end_date end end @@ -175,7 +175,7 @@ module RecurringTodos # offset needs to be 1.day for daily patterns or the start will be the # same day as the previous def determine_start(previous, offset = 0.day) - start = self.start_from || NullTime.new + start = start_from || NullTime.new if previous # check if the start_from date is later than previous. If so, use # start_from as start to search for next date diff --git a/app/models/recurring_todos/abstract_recurring_todos_builder.rb b/app/models/recurring_todos/abstract_recurring_todos_builder.rb index 4d39cc54..e3309f27 100644 --- a/app/models/recurring_todos/abstract_recurring_todos_builder.rb +++ b/app/models/recurring_todos/abstract_recurring_todos_builder.rb @@ -60,7 +60,7 @@ module RecurringTodos # get pattern independend attributes filtered_attributes = filter_generic_attributes(attributes) # append pattern specific attributes - attributes_to_filter.each{ |key| filtered_attributes[key]= attributes[key] if attributes.key?(key) } + attributes_to_filter.each { |key| filtered_attributes[key] = attributes[key] if attributes.key?(key) } filtered_attributes end diff --git a/app/models/recurring_todos/daily_recurrence_pattern.rb b/app/models/recurring_todos/daily_recurrence_pattern.rb index 69e2d73f..35a0ea16 100644 --- a/app/models/recurring_todos/daily_recurrence_pattern.rb +++ b/app/models/recurring_todos/daily_recurrence_pattern.rb @@ -36,8 +36,8 @@ module RecurringTodos if only_work_days? # jump over weekend if necessary - return start + 2.day if start.wday() == 6 # saturday - return start + 1.day if start.wday() == 0 # sunday + return start + 2.day if start.wday == 6 # saturday + return start + 1.day if start.wday == 0 # sunday return start else # if there was no previous todo, do not add n: the first todo starts on diff --git a/app/models/recurring_todos/weekly_recurrence_pattern.rb b/app/models/recurring_todos/weekly_recurrence_pattern.rb index c5824d30..5ba3a13f 100644 --- a/app/models/recurring_todos/weekly_recurrence_pattern.rb +++ b/app/models/recurring_todos/weekly_recurrence_pattern.rb @@ -29,7 +29,7 @@ module RecurringTodos def validate super validate_not_blank(every_x_week, "Every other nth week may not be empty for weekly recurrence setting") - something_set = %w{ sunday monday tuesday wednesday thursday friday saturday }.inject(false) { |set, day| set || self.send("on_#{day}") } + something_set = %w{ sunday monday tuesday wednesday thursday friday saturday }.inject(false) { |set, day| set || send("on_#{day}") } errors[:base] << "You must specify at least one day on which the todo recurs" unless something_set end @@ -41,19 +41,19 @@ module RecurringTodos # we did not find anything this week, so check the nth next, starting from # sunday - start = start + self.every_x_week.week - (start.wday).days + start = start + every_x_week.week - (start.wday).days start = find_first_day_in_this_week(start) return start unless start == -1 - raise Exception.new, "unable to find next weekly date (#{self.every_day})" + raise Exception.new, "unable to find next weekly date (#{every_day})" end private def determine_start_date(previous) if previous.nil? - return self.start_from || Time.zone.now + return start_from || Time.zone.now else start = previous + 1.day if start.wday == 0 @@ -61,10 +61,10 @@ module RecurringTodos # that week. Note that we already went into the next week, so -1 start += (every_x_week - 1).week end - unless self.start_from.nil? + unless start_from.nil? # check if the start_from date is later than previous. If so, use # start_from as start to search for next date - start = self.start_from if self.start_from > previous + start = start_from if start_from > previous end return start end diff --git a/app/models/recurring_todos/yearly_recurrence_pattern.rb b/app/models/recurring_todos/yearly_recurrence_pattern.rb index 3c53c6c5..be7df3ba 100644 --- a/app/models/recurring_todos/yearly_recurrence_pattern.rb +++ b/app/models/recurring_todos/yearly_recurrence_pattern.rb @@ -31,7 +31,7 @@ module RecurringTodos end def recurrence_pattern - if self.recurrence_selector == 0 + if recurrence_selector == 0 I18n.t("todos.recurrence.pattern.every_year_on", :date => date_as_month_day) else I18n.t("todos.recurrence.pattern.every_year_on", @@ -94,11 +94,11 @@ module RecurringTodos the_next = start.month > month ? Time.zone.local(start.year + 1, month, 1) : start # get the xth day of the month - the_next = get_xth_day_of_month(self.every_xth_day, day_of_week, month, the_next.year) + the_next = get_xth_day_of_month(every_xth_day, day_of_week, month, the_next.year) # if the_next is before previous, we went back into the past, so try next # year - the_next = get_xth_day_of_month(self.every_xth_day, day_of_week, month, start.year + 1) if the_next <= start + the_next = get_xth_day_of_month(every_xth_day, day_of_week, month, start.year + 1) if the_next <= start the_next end diff --git a/app/models/search/search_results.rb b/app/models/search/search_results.rb index 4db5d59d..d0003efa 100644 --- a/app/models/search/search_results.rb +++ b/app/models/search/search_results.rb @@ -19,33 +19,33 @@ module Search end def number_of_finds - results[:todos].size + results[:projects].size + results[:notes].size + results[:contexts].size + results[:tags].size + results[:todos].size + results[:projects].size + results[:notes].size + results[:contexts].size + results[:tags].size end private def incomplete_todos(terms) - @user.todos. - where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND todos.completed_at IS NULL", terms, terms) + @user.todos + .where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND todos.completed_at IS NULL", terms, terms) .includes(Todo::DEFAULT_INCLUDES) .reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")) end def complete_todos(terms) - @user.todos. - where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND NOT (todos.completed_at IS NULL)", terms, terms) + @user.todos + .where("(todos.description " + Common.like_operator + " ? OR todos.notes " + Common.like_operator + " ?) AND NOT (todos.completed_at IS NULL)", terms, terms) .includes(Todo::DEFAULT_INCLUDES) .reorder("todos.completed_at DESC") end def todo_tags_by_name(terms) - Tagging.find_by_sql([ - "SELECT DISTINCT tags.name as name " + - "FROM tags " + - "LEFT JOIN taggings ON tags.id = taggings.tag_id " + - "LEFT JOIN todos ON taggings.taggable_id = todos.id " + - "WHERE todos.user_id=? " + - "AND tags.name " + Common.like_operator + " ? ", @user.id, terms]) + Tagging.find_by_sql([" + SELECT DISTINCT tags.name as name + FROM tags + LEFT JOIN taggings ON tags.id = taggings.tag_id + LEFT JOIN todos ON taggings.taggable_id = todos.id + WHERE todos.user_id = ? + AND tags.name " + Common.like_operator + " ? ", @user.id, terms]) end end end diff --git a/app/models/stats/actions.rb b/app/models/stats/actions.rb index 6193084a..b9be9de6 100644 --- a/app/models/stats/actions.rb +++ b/app/models/stats/actions.rb @@ -362,7 +362,7 @@ module Stats end def convert_to_weeks_running_array(records, array_size) - return convert_to_array(records, array_size) { |r| [difference_in_weeks(r.completed_at, r.created_at)]} + return convert_to_array(records, array_size) { |r| [difference_in_weeks(r.completed_at, r.created_at)] } end def convert_to_weeks_running_from_today_array(records, array_size) @@ -391,7 +391,7 @@ module Stats def convert_to_cumulative_array(array, max) # calculate fractions - a = Array.new(array.size) {|i| array[i] * 100.0 / max} + a = Array.new(array.size) { |i| array[i] * 100.0 / max } # make cumulative 1.upto(array.size - 1) { |i| a[i] += a[i - 1] } return a @@ -422,7 +422,7 @@ module Stats def compute_running_avg_array(set, upper_bound) result = set_three_month_avg(set, upper_bound) result[upper_bound - 1] = result[upper_bound - 1] * 3 if upper_bound == set.length - result[upper_bound - 2] = result[upper_bound - 2] * 3 / 2 if upper_bound > 1 and upper_bound == set.length + result[upper_bound - 2] = result[upper_bound - 2] * 3 / 2 if upper_bound > 1 && upper_bound == set.length result[0] = "null" result end # unsolved, not triggered, edge case for set.length == upper_bound + 1 diff --git a/app/models/stats/projects.rb b/app/models/stats/projects.rb index 429e68ed..b3d20897 100644 --- a/app/models/stats/projects.rb +++ b/app/models/stats/projects.rb @@ -22,7 +22,7 @@ module Stats def find_top10_longest_running_projects projects = user.projects.order('created_at ASC') - projects.sort_by{ |p| p.running_time }.reverse.take(10) + projects.sort_by { |p| p.running_time }.reverse.take(10) end end end diff --git a/app/models/tag.rb b/app/models/tag.rb index fc3b876e..c3be0e1e 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -9,8 +9,7 @@ class Tag < ApplicationRecord # If database speed becomes an issue, you could remove these validations and # rescue the ActiveRecord database constraint errors instead. - validates_presence_of :name - validates_uniqueness_of :name, :scope => "user_id", :case_sensitive => false + validates :name, presence: true, uniqueness: { :scope => "user_id", :case_sensitive => false } before_create :before_create diff --git a/app/models/tagging.rb b/app/models/tagging.rb index 42513283..617d40d2 100644 --- a/app/models/tagging.rb +++ b/app/models/tagging.rb @@ -8,6 +8,6 @@ class Tagging < ApplicationRecord private def delete_orphaned_tag - tag.destroy if tag and tag.taggings.count == 0 + tag.destroy if tag && tag.taggings.count == 0 end end diff --git a/app/models/todo.rb b/app/models/todo.rb index 043dbbdd..c97f3ade 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -69,7 +69,7 @@ class Todo < ApplicationRecord # state machine include AASM - aasm_initial_state = Proc.new { (self.show_from && self.user && (self.show_from > self.user.date)) ? :deferred : :active } + aasm_initial_state = Proc.new { (show_from && user && (show_from > user.date)) ? :deferred : :active } aasm :column => :state do state :active @@ -100,11 +100,11 @@ class Todo < ApplicationRecord # Description field can't be empty, and must be < 100 bytes Notes must be < # 60,000 bytes (65,000 actually, but I'm being cautious) - validates_presence_of :description - validates_length_of :description, :maximum => MAX_DESCRIPTION_LENGTH - validates_length_of :notes, :maximum => MAX_NOTES_LENGTH, :allow_nil => true - validates_presence_of :show_from, :if => :deferred? - validates_presence_of :context + validates :description, presence: true, length: { maximum: MAX_DESCRIPTION_LENGTH } + validates :notes, length: { maximum: MAX_NOTES_LENGTH, allow_nil: true } + validates :show_from, presence: true, if: :deferred? + validates :context, presence: true + validate :check_show_from_in_future def check_show_from_in_future @@ -139,18 +139,18 @@ class Todo < ApplicationRecord end def not_part_of_hidden_container? - !((self.project && self.project.hidden?) || self.context.hidden?) + !((project && project.hidden?) || context.hidden?) end # Returns a string with description def specification - project_name = self.project.is_a?(NullProject) ? "(none)" : self.project.name - return "\'#{self.description}\' <\'#{self.context.title}\'; \'#{project_name}\'>" + project_name = project.is_a?(NullProject) ? "(none)" : project.name + return "\'#{description}\' <\'#{context.title}\'; \'#{project_name}\'>" end def save_predecessors unless @predecessor_array.nil? # Only save predecessors if they changed - current_array = self.predecessors + current_array = predecessors remove_array = current_array - @predecessor_array add_array = @predecessor_array - current_array @@ -158,13 +158,13 @@ class Todo < ApplicationRecord remove_array.each do |todo| unless todo.nil? @removed_predecessors << todo - self.predecessors.delete(todo) + predecessors.delete(todo) end end add_array.each do |todo| unless todo.nil? - self.predecessors << todo unless self.predecessors.include?(todo) + predecessors << todo unless predecessors.include?(todo) else logger.error "Could not find #{todo.description}" # Unexpected since validation passed end @@ -173,7 +173,7 @@ class Todo < ApplicationRecord end def touch_predecessors - self.touch + touch predecessors.each(&:touch_predecessors) end @@ -183,10 +183,10 @@ class Todo < ApplicationRecord # remove predecessor and activate myself if it was the last predecessor def remove_predecessor(predecessor) - self.predecessors.delete(predecessor) - if self.predecessors.empty? - self.reload # reload predecessors - self.activate! + predecessors.delete(predecessor) + if predecessors.empty? + reload # reload predecessors + activate! else save! end @@ -196,10 +196,10 @@ class Todo < ApplicationRecord def is_successor?(todo) if self == todo return true - elsif self.successors.empty? + elsif successors.empty? return false else - self.successors.each do |item| + successors.each do |item| if item.is_successor?(todo) return true end @@ -213,7 +213,7 @@ class Todo < ApplicationRecord end def hidden? - self.project.hidden? || self.context.hidden? + project.hidden? || context.hidden? end def toggle_completion! @@ -229,7 +229,7 @@ class Todo < ApplicationRecord activate else # parse Date objects into the proper timezone - date = date.in_time_zone.beginning_of_day if (date.is_a? Date) + date = date.in_time_zone.beginning_of_day if date.is_a? Date # show_from needs to be set before state_change because of "bug" in aasm. # If show_from is not set, the todo will not validate and thus aasm will not save @@ -258,14 +258,14 @@ class Todo < ApplicationRecord end def from_recurring_todo? - return self.recurring_todo_id != nil + return recurring_todo_id != nil end def add_predecessor_list(predecessor_list) - return unless predecessor_list.kind_of? String + return unless predecessor_list.is_a? String @predecessor_array = predecessor_list.split(",").inject([]) do |list, todo_id| - predecessor = self.user.todos.find(todo_id.to_i) if todo_id.present? + predecessor = user.todos.find(todo_id.to_i) if todo_id.present? list << predecessor unless predecessor.nil? list end @@ -307,7 +307,7 @@ class Todo < ApplicationRecord # value will be a string. In that case convert to array deps = [deps] unless deps.class == Array - deps.each { |dep| self.add_predecessor(self.user.todos.find(dep.to_i)) if dep.present? } + deps.each { |dep| add_predecessor(user.todos.find(dep.to_i)) if dep.present? } end alias_method :original_context=, :context= @@ -376,7 +376,7 @@ class Todo < ApplicationRecord def destroy # activate successors if they only depend on this action - self.pending_successors.each do |successor| + pending_successors.each do |successor| successor.uncompleted_predecessors.delete(self) if successor.uncompleted_predecessors.empty? successor.activate! diff --git a/app/models/user.rb b/app/models/user.rb index a7fdc43c..c0ebbdb5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -5,7 +5,6 @@ class User < ApplicationRecord # Virtual attribute for the unencrypted password attr_accessor :password - #for will_paginate plugin cattr_accessor :per_page @@per_page = 25 @@ -15,11 +14,11 @@ class User < ApplicationRecord end def update_positions(context_ids) - context_ids.each_with_index { |id, position| - context = self.detect { |c| c.id == id.to_i } + context_ids.each_with_index do |id, position| + context = detect { |c| c.id == id.to_i } raise I18n.t('models.user.error_context_not_associated', :context => id, :user => @user.id) if context.nil? context.update_attribute(:position, position + 1) - } + end end end @@ -29,27 +28,27 @@ class User < ApplicationRecord end def update_positions(project_ids) - project_ids.each_with_index { |id, position| - project = self.find_by(id: id.to_i) + project_ids.each_with_index do |id, position| + project = find_by(id: id.to_i) raise I18n.t('models.user.error_project_not_associated', :project => id, :user => @user.id) if project.nil? project.update_attribute(:position, position + 1) - } + end end def projects_in_state_by_position(state) - self.select { |p| p.state == state }.sort_by { |p| p.position } + select { |p| p.state == state }.sort_by { |p| p.position } end def next_from(project) - self.offset_from(project, 1) + offset_from(project, 1) end def previous_from(project) - self.offset_from(project, -1) + offset_from(project, -1) end def offset_from(project, offset) - projects = self.projects_in_state_by_position(project.state) + projects = projects_in_state_by_position(project.state) position = projects.index(project) return nil if position == 0 && offset < 0 projects.at(position + offset) @@ -57,7 +56,7 @@ class User < ApplicationRecord def cache_note_counts project_note_counts = Note.group(:project_id).count - self.each do |project| + each do |project| project.cached_note_count = project_note_counts[project.id] || 0 end end @@ -65,7 +64,7 @@ class User < ApplicationRecord def alphabetize(scope_conditions = {}) projects = where(scope_conditions) projects = projects.sort_by { |project| project.name.downcase } - self.update_positions(projects.map(&:id)) + update_positions(projects.map(&:id)) return projects end @@ -75,7 +74,7 @@ class User < ApplicationRecord todos_in_project.reject { |p| p.todos.active.count > 0 } sorted_project_ids = todos_in_project.map(&:id) - all_project_ids = self.map(&:id) + all_project_ids = map(&:id) other_project_ids = all_project_ids - sorted_project_ids update_positions(sorted_project_ids + other_project_ids) @@ -108,19 +107,19 @@ class User < ApplicationRecord has_one :preference, dependent: :destroy has_many :attachments, through: :todos - validates_presence_of :login - validates_presence_of :password, if: :password_required? - validates_length_of :password, within: 5..72, if: :password_required? - validates_presence_of :password_confirmation, if: :password_required? - validates_confirmation_of :password - validates_length_of :login, within: 3..80 + validates :login, presence: true, length: { within: 3..80 } validates_uniqueness_of :login, on: :create, :case_sensitive => false + validates :password, presence: true, length: { within: 5..72 }, if: :password_required? + validates :password_confirmation, presence: true, if: :password_required? + validates :password, confirmation: true + validates :email, allow_blank: true, format: { with: URI::MailTo::EMAIL_REGEXP } + validate :validate_auth_type - validates :email, :allow_blank => true, format: { with: URI::MailTo::EMAIL_REGEXP } before_create :crypt_password, :generate_token before_update :crypt_password - before_destroy :destroy_dependencies, :delete_taggings, prepend: true # run before deleting todos, projects, contexts, etc. + # Run before deleting todos, projects, contexts, etc. + before_destroy :destroy_dependencies, :delete_taggings, prepend: true def validate_auth_type unless Tracks::Config.auth_schemes.include?(auth_type) @@ -136,8 +135,8 @@ class User < ApplicationRecord return nil if candidate.nil? if Tracks::Config.auth_schemes.include?('database') - return candidate if candidate.auth_type == 'database' and - candidate.password_matches? pass + + return candidate if (candidate.auth_type == 'database' && candidate.password_matches?(pass)) end return nil @@ -177,11 +176,11 @@ class User < ApplicationRecord end def generate_token - self.token = Digest::SHA1.hexdigest "#{Time.now.to_i}#{rand}" + self.token = Digest::SHA1.hexdigest "#{Time.zone.now.to_i}#{rand}" end def remember_token? - remember_token_expires_at && Time.now.utc < remember_token_expires_at + remember_token_expires_at && Time.zone.now.utc < remember_token_expires_at end # These create and unset the fields required for remembering users between browser closes @@ -209,7 +208,7 @@ class User < ApplicationRecord def crypt_password return if password.blank? - write_attribute("crypted_password", self.create_hash(password)) if password == password_confirmation + write_attribute("crypted_password", create_hash(password)) if password == password_confirmation end def password_required? diff --git a/app/services/rich_message_extractor.rb b/app/services/rich_message_extractor.rb index 2e67a94e..f78a3d21 100644 --- a/app/services/rich_message_extractor.rb +++ b/app/services/rich_message_extractor.rb @@ -17,7 +17,7 @@ class RichMessageExtractor DUE_MARKER, TAG_MARKER, STAR_MARKER - ] + ].freeze def initialize(message) @message = message @@ -44,7 +44,7 @@ class RichMessageExtractor # Regex only matches one tag, so recurse until we have them all while string.match /#(.*?)(?=[#{ALL_MARKERS.join}]|\Z)/ tags << sanitize($1) - string.gsub!(/##{$1}/,'') + string.gsub!(/##{$1}/, '') end tags.empty? ? nil : tags end @@ -65,11 +65,11 @@ class RichMessageExtractor private - def select_for symbol + def select_for(symbol) @message.match /#{symbol}(.*?)(?=[#{ALL_MARKERS.join}]|\Z)/ end - def fix_date_string yymmdd + def fix_date_string(yymmdd) "20#{yymmdd[0..1]}-#{yymmdd[2..3]}-#{yymmdd[4..5]} 00:00" end end diff --git a/app/views/integrations/search_plugin.xml.builder b/app/views/integrations/search_plugin.xml.builder index 3468c415..bf6a0e50 100644 --- a/app/views/integrations/search_plugin.xml.builder +++ b/app/views/integrations/search_plugin.xml.builder @@ -1,14 +1,12 @@ xml.instruct! xml.OpenSearchDescription 'xmlns' => "http://a9.com/-/spec/opensearch/1.1/" do - xml.ShortName Tracks xml.Description t('integrations.opensearch_description') xml.InputEncoding 'UTF-8' xml.Image("data:image/x-icon;base64," + @icon_data, - 'width' => '16', 'height' => '16') + 'width' => '16', 'height' => '16') xml.Url 'type' => 'text/html', 'method' => 'GET', - 'template' => url_for(:controller => 'search', :action => 'results', - :only_path => false) + '?search={searchTerms}' + 'template' => url_for(:controller => 'search', :action => 'results', + :only_path => false) + '?search={searchTerms}' end - diff --git a/app/views/projects/index.atom.builder b/app/views/projects/index.atom.builder index e95aedb7..153aaa47 100644 --- a/app/views/projects/index.atom.builder +++ b/app/views/projects/index.atom.builder @@ -9,4 +9,4 @@ atom_feed do |feed| entry.content(project_summary(project), :type => :html) end end -end \ No newline at end of file +end diff --git a/app/views/recurring_todos/_edit_form.html.erb b/app/views/recurring_todos/_edit_form.html.erb index 79d2c8ea..1a91e15a 100644 --- a/app/views/recurring_todos/_edit_form.html.erb +++ b/app/views/recurring_todos/_edit_form.html.erb @@ -11,7 +11,7 @@ text_area_tag( "recurring_todo[notes]", @form_helper.notes, {:cols => 29, :rows => 6}) -%> - " /> + " /> diff --git a/app/views/todos/_new_todo_form.html.erb b/app/views/todos/_new_todo_form.html.erb index aa02e6a6..307a8a18 100644 --- a/app/views/todos/_new_todo_form.html.erb +++ b/app/views/todos/_new_todo_form.html.erb @@ -63,7 +63,7 @@ <%= source_view_tag( @source_view ) %> - <%= hidden_field_tag :_tag_name, @tag_name.underscore.gsub(/\s+/,'_') if source_view_is :tag %> + <%= hidden_field_tag :_tag_name, @tag_name.underscore.gsub(/\s+/, '_') if source_view_is :tag %>
        <%= User.human_attribute_name('login') %><%= User.human_attribute_name('display_name') %><%= User.human_attribute_name('email') %><%= User.human_attribute_name('auth_type') %><%= User.human_attribute_name('open_id_url') %><%= link_to User.human_attribute_name('login'), url_for(:order => 'login') %><%= h User.human_attribute_name('display_name') %><%= link_to User.human_attribute_name('email'), url_for(:order => 'email') %><%= link_to User.human_attribute_name('auth_type'), url_for(:order => 'auth_type') %><%= link_to User.human_attribute_name('open_id_url'), url_for(:order => 'open_id_url') %> <%= t('users.total_actions') %> <%= t('users.total_contexts') %> <%= t('users.total_projects') %> <%= t('users.total_notes') %><%= User.human_attribute_name('created_at') %><%= User.human_attribute_name('last_login_at') %><%= link_to User.human_attribute_name('created_at'), url_for(:order => 'created_at') %><%= link_to User.human_attribute_name('last_login_at'), url_for(:order => 'last_login_at') %>  
        <%=h user.login %><%=h user.display_name %><%=h user.email %><%= h user.login %><%= h user.display_name %><%= h user.email %> <%= h user.auth_type %> <%= h user.open_id_url || '-' %> <%= h user.todos.size %>
        - - - - - - - - - - - - - - - - - - - - -
        BeschreibungDownload link
        YAML-Datei mit all Ihren Aktionen, Umgebungen, Projekten, Tags und Notizen<%= link_to "YAML Datei", :controller => 'data', :action => 'yaml_export' %>
        CSV-Datei mit all Ihren Aktionen, benannten Umgebungen und Projekten<%= link_to "CSV Dile (Aktionen, Umgebungen und Projekte)", :controller => 'data', :action => 'csv_actions' %>
        CSV-Datei mit all Ihren Notizen<%= link_to "CSV Datei (nur Notizen)", :controller => 'data', :action => 'csv_notes' %>
        XML-Datei mit all Ihren Aktionen, Umgebungen, Projekten, Tags und Notizen<%= link_to "XML file (actions only)", :controller => 'data', :action => 'xml_export' %>
        - - diff --git a/app/views/data/index.en.html.erb b/app/views/data/index.en.html.erb deleted file mode 100644 index 59052c3f..00000000 --- a/app/views/data/index.en.html.erb +++ /dev/null @@ -1,36 +0,0 @@ -
        -
        -
        -

        Exporting data

        -

        You can choose between the following formats:

        -
          -
        • YAML: Best for exporting data.
          Please note that importing YAML files is currently supported only in experimentally. Do not rely on it for backing up critical data.
          • -
        • CSV: Best for importing into spreadsheet or data analysis software
          • -
        • XML: Best for importing or repurposing the data
          • -
        -
        -

        - - - - - - - - - - - - - - - - - - - - - -
        DescriptionDownload link
        YAML file containing all your actions, contexts, projects, tags and notes<%= link_to "YAML file", data_yaml_export_path %>
        CSV file containing all of your actions, with named contexts and projects<%= link_to "CSV file (actions, contexts and projects)", data_csv_actions_path %>
        CSV file containing all your notes<%= link_to "CSV file (notes only)", data_csv_notes_path %>
        XML file containing all your actions, contexts, projects, tags and notes<%= link_to "XML file (actions only)", data_xml_export_path %>
        -
        -
        diff --git a/app/views/data/index.es.html.erb b/app/views/data/index.es.html.erb deleted file mode 100644 index 84455349..00000000 --- a/app/views/data/index.es.html.erb +++ /dev/null @@ -1,36 +0,0 @@ -
        -
        -
        -

        Exportar datos

        -

        Puede escoger entre los siguientes formatos:

        -
          -
        • YAML: Mejor formato para exportar datos.
          Por favor tenga en cuenta que la importación de ficheros YAML actualmente esta soportada de forma experimental. No confíe en este formato para hacer copias de seguridad de datos importantes.
          • -
        • CSV: Mejor formato para importar en una hoja de cálculo o en programas de análisis de datos.
          • -
        • XML: Mejor formato para transformar los datos a otro formato
          • -
        -
        -

        - - - - - - - - - - - - - - - - - - - - - -
        DescripciónEnlace de descarga
        Fichero YAML con todas sus acciones, contextos, proyectos, etiquetas y notas<%= link_to "Fichero YAML", data_yaml_export_path %>
        Fichero CSV con todas sus acciones, con contextos por nombre y proyectos<%= link_to "Fichero CSV (acciones, contextos y proyectos)", data_csv_actions_path %>
        Fichero CSV con todas sus notas<%= link_to "Fichero CSV (sólo notas)", data_csv_notes_path %>
        Fichero XML con todas sus acciones, contextos, proyectos, etiquetas y notas<%= link_to "Fichero XML", data_xml_export_path %>
        -
        -
        diff --git a/app/views/data/index.html.erb b/app/views/data/index.html.erb new file mode 100644 index 00000000..879e3bb8 --- /dev/null +++ b/app/views/data/index.html.erb @@ -0,0 +1,36 @@ +
        +
        +
        +

        <%= I18n.t "data.export.title" %>

        +

        <%= I18n.t "data.export.format_header" %>

        +
          +
        • <%= raw I18n.t "data.export.yaml_description", yaml: "" + I18n.t("data.yaml") + "" %>
          <%= I18n.t "data.export.yaml_experimental" %>
          • +
        • <%= raw I18n.t "data.export.csv_description", csv: "" + I18n.t("data.csv") + "" %>
          • +
        • <%= raw I18n.t "data.export.xml_description", xml: "" + I18n.t("data.xml") + "" %>
          • +
        +
        +

        + + + + + + + + + + + + + + + + + + + + + +
        <%= I18n.t "common.description" %><%= I18n.t "data.export.download_link" %>
        <%= I18n.t "data.export.yaml_link_description" %><%= link_to I18n.t("data.export.yaml_link_title"), data_yaml_export_path %>
        <%= I18n.t "data.export.csv_actions_description" %><%= link_to I18n.t("data.export.csv_actions_title"), data_csv_actions_path %>
        <%= I18n.t "data.export.csv_notes_description" %><%= link_to I18n.t("data.export.csv_notes_title"), data_csv_notes_path %>
        <%= I18n.t "data.export.xml_link_description" %><%= link_to I18n.t('data.export.xml_link_title'), data_xml_export_path %>
        +
        +
        diff --git a/app/views/data/yaml_form.de.html.erb b/app/views/data/yaml_form.de.html.erb deleted file mode 100644 index a1827241..00000000 --- a/app/views/data/yaml_form.de.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -
        -
        -
        -

        Vorsicht: vor dem Import der YAML Datei werden alle Daten in Ihrer Datenbank gelöscht. - Falls Sie entsprechenden Zugriff auf Ihre Datenbank haben, empfiehlt es sich, ein Backup anzulegen, - bevor Sie fortfahren. -

        -

        Fügen Sie den Inhalt der kopierten YAML Datei in das untenstehende Formular ein:

        -
        -

        - <%= form_for :import, @import, :url => {:controller => 'data', :action => 'yaml_import'} do |f| %> - <%= f.text_area :yaml %>
        - - <% end %> -

        -
        -
        diff --git a/app/views/data/yaml_form.en.html.erb b/app/views/data/yaml_form.en.html.erb deleted file mode 100644 index c7f04165..00000000 --- a/app/views/data/yaml_form.en.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -
        -
        -
        -

        Beware: all your current data will be destroyed before importing - the YAML file, so if you have access to the database, we strongly recommend - backing up the database right now in case that anything goes wrong. -

        -

        Paste the contents of the YAML file you exported into the text box below:

        -
        -

        - <%= form_for :import, @import, :url => {:controller => 'data', :action => 'yaml_import'} do |f| %> - <%= f.text_area :yaml %>
        - - <% end %> -

        -
        -
        diff --git a/app/views/data/yaml_form.html.erb b/app/views/data/yaml_form.html.erb new file mode 100644 index 00000000..62e43fc0 --- /dev/null +++ b/app/views/data/yaml_form.html.erb @@ -0,0 +1,14 @@ +
        +
        +
        +

        <%= raw I18n.t "data.import.yaml_warning", warning: '' + I18n.t('data.import.warning') + '' %>

        +

        <%= I18n.t "data.import.paste_field" %>

        +
        +

        + <%= form_for :import, @import, :url => {:controller => 'data', :action => 'yaml_import'} do |f| %> + <%= f.text_area :yaml %>
        + + <% end %> +

        +
        +
        diff --git a/app/views/data/yaml_import.html.erb b/app/views/data/yaml_import.html.erb index fff0144e..15a77c95 100644 --- a/app/views/data/yaml_import.html.erb +++ b/app/views/data/yaml_import.html.erb @@ -1,5 +1,5 @@ <% if !(@errmessage == '') %> -

        <%= t('data.import_errors') %>:

        <%= @errmessage %>

        +

        <%= t('data.import.errors.some') %>:

        <%= @errmessage %>

        <% else %> -

        <%= t('data.import_successful') %>

        +

        <%= t('data.import.successful') %>

        <% end %> diff --git a/app/views/integrations/index.de.html.erb b/app/views/integrations/index.de.html.erb deleted file mode 100644 index 1255e8a5..00000000 --- a/app/views/integrations/index.de.html.erb +++ /dev/null @@ -1,51 +0,0 @@ -<% has_contexts = !current_user.contexts.empty? -%> -

        Integration

        -

        Tracks kann mit verschiedenen Werkzeugen zusammenarbeiten... - was immer Sie brauchen, um Ihre Aufgaben zu erledigen! - Auf dieser Seite finden Sie Informationen, um einige dieser Werkzeuge einzurichten. - Diese Beispiele sind nicht unbedingt auf Ihre Umgebung anwendbar oder bedürfen mehr - technisches Wissen als andere. - Weitere Informationen finden Sie in der <%= link_to "Entwickler Documentation der Tracks' REST API", url_for(:action => 'rest_api') %> (englisch).

        -

        Inhalt:

        -
        -

        Sie haben weitere Beispiele? - Berichten Sie uns - in unserem Tipps&Tricks Forum, damit wir es für die nächsten Versionen berücksichtigen können. -

        - - -

        Automatically Email Yourself Upcoming Actions

        - -

        If you enter the following entry to your crontab, you will receive email every day around 5 AM with a list of the upcoming actions which are due within the next 7 days.

        - - - -

        You can of course use other text <%= link_to 'feeds provided by Tracks', feeds_path %> -- why not email a list of next actions in a particular project to a group of colleagues who are working on the project?

        - - -

        Integrated email/SMS receiver

        -

        - If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into tracks. Steps to set it up: -

        -
          -
        • Go to <%= link_to t('layouts.navigation.preferences'), preferences_url %> and - set your "<%= Preference.human_attribute_name('sms_email') %>" and - "<%= Preference.human_attribute_name('sms_context') %>" for todos sent in - via email (which could come from an SMS message)
          • -
        • In sendmail/qmail/postfix/whatever, set up an email address - alias to pipe messages to 
          /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
          • -
        • Send an email to your newly configured address!
          • -
        -

        You can also use the Rich Todo API to send in tasks like "do laundry @ Home" - or "Call Bill > project X". The subject of the message will fill description, - context, and project, while the body will populate the tasks's note. -

        -

        - You may need to configure your site.yml to tell the message gateway to look at the to: field or from: field to - lookup Tracks' user from the email address in that field.

        -

        You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to single_user and pass the login of the user: - 

        TRACKS_MAIL_RECEIVER=<%=current_user.login%> /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
        -

        diff --git a/app/views/integrations/index.en.html.erb b/app/views/integrations/index.en.html.erb deleted file mode 100644 index b61350cf..00000000 --- a/app/views/integrations/index.en.html.erb +++ /dev/null @@ -1,119 +0,0 @@ -<% has_contexts = !current_user.contexts.empty? -%> -

        Integrations

        -

        Tracks can be integrated with a number of other tools... - whatever it takes to help you get things done! - This page has information on setting up some of these. - Not all of these are applicable to all platforms, and some require more - technical knowledge than others. - See also <%= link_to "developer documentation for Tracks' REST API", url_for(:action => 'rest_api') %>.

        -

        Contents:

        -
        -

        Do you have one of your own to add? - Tell us about - it in our Tips and Tricks forum and we may include it on this page in a future versions of Tracks. -

        - - -

        Automatically Email Yourself Upcoming Actions

        - -

        If you enter the following entry to your crontab, you will receive email every day around 5 AM with a list of the upcoming actions which are due within the next 7 days.

        - - - -

        You can of course use other text <%= link_to 'feeds provided by Tracks', feeds_path %> -- why not email a list of next actions in a particular project to a group of colleagues who are working on the project?

        - - -

        Integrated email/SMS receiver

        -

        - If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into tracks. Steps to set it up: -

        -
          -
        • Go to <%= link_to t('layouts.navigation.preferences'), preferences_url %> and - set your "<%= Preference.human_attribute_name('sms_email') %>" and - "<%= Preference.human_attribute_name('sms_context') %>" for todos sent in - via email (which could come from an SMS message)
          • -
        • In sendmail/qmail/postfix/whatever, set up an email address - alias to pipe messages to 
          /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
          • -
        • Send an email to your newly configured address!
          • -
        -

        You can also use the Rich Todo API to send in tasks like "do laundry @ Home" - or "Call Bill > project X". The subject of the message will fill description, - context, and project, while the body will populate the tasks's note. -

        -

        - You may need to configure your site.yml to tell the message gateway to look at the to: field or from: field to - lookup Tracks' user from the email address in that field.

        -

        You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to single_user and pass the login of the user: - 

        TRACKS_MAIL_RECEIVER=<%=current_user.login%> /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
        -

        - - -

        Send emails to Tracks with Mailgun

        -

        -If you want to email tasks to Tracks, but cannot run a mailserver on the same host, -you could use the Mailgun support built in to Tracks. -

        -

        -For this to work your Tracks server will need to be reachable from the internet, so -that Mailgun can POST data to it. -

        -

          -
        • Go to <%= link_to 'http://mailgun.com' %> and register for a free account.
          • -
        • Go to 'Routes' in the Mailgun control panel, and add a new route:
          • -
            -
          • 'Filter expression' should be set to 'catch_all()'
            • -
          • 'Action' should be 'forward("http://mytracksserver.domain.com/mailgun/mime")' -
          -
        • Go to <%= link_to t('layouts.navigation.preferences'), preferences_url %> and - enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the - "<%= Preference.human_attribute_name('sms_email') %>" box.
          • -
        • Select a default context for emails to be put in with - "<%= Preference.human_attribute_name('sms_context') %>"
          • -
        • Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml' -
        • Update the mailmap in 'site.yml' to define which senders can send emails to - which incoming addresses. For example, to send emails from your work and home - email accounts to your tracks Mailgun route, set it up like this: - 
          -mailmap:
-  tracks@user.mailgun.org:
-  - me@myhome.domain.net
-  - mr.user@work.company.com
-
          -
        -

        All the comments about the email format from the section above apply to the -Mailgun handling, as the data is processed the same way

        - - -

        Rich Todo Message Format

        -

        For both of the above methods, the follow format can be used:

        -
        my awesome todo @context ~project <131012 >131009 #tag1 #tag2 *
        -

        The fields are:

        - - - - - - - - - - - - - - - - - - - - - - -
        SymbolMeaning
        @The context to place the Todo in
        ~The project to place the Todo in
        <The due date for the Todo (may be 2 digits for day, 4 digits for month-day, or 6 digits for year-month-day)
        >The due date for the Todo (may be 2 digits for day, 4 digits for month-day, or 6 digits for year-month-day)
        #A tag to apply to the Todo - may be used multiple times
        *Flag to star the Todo
        -

        All symbols are optional, and text up to the first symbol (or end of string) is used as the description of the todo

        diff --git a/app/views/integrations/index.html.erb b/app/views/integrations/index.html.erb new file mode 100644 index 00000000..d619d323 --- /dev/null +++ b/app/views/integrations/index.html.erb @@ -0,0 +1,85 @@ +<% has_contexts = !current_user.contexts.empty? -%> +

        <%= I18n.t 'integrations.title' %>

        +

        <%= raw I18n.t 'integrations.intro', documentation_link: link_to(I18n.t('integrations.developer_documentation_link'), url_for(:action => 'rest_api')) %>

        +

        <%= I18n.t 'integrations.contents_header' %>

        + +

        <%= raw I18n.t 'integrations.add_your_own', tell_us_link: link_to(I18n.t('integrations.tell_us_link_text'), 'https://github.com/TracksApp/tracks/issues') %>

        + + +

        <%= I18n.t 'integrations.sections.automatic_email' %>

        + +

        <%= I18n.t 'integrations.cron_1' %>

        + + + +

        <%= raw I18n.t 'integrations.cron_2', feeds_link: link_to(I18n.t('integrations.feeds_link_text'), feeds_path) %>

        + + +

        <%= I18n.t 'integrations.sections.message_gateway' %>

        +

        <%= I18n.t 'integrations.message_gateway.description' %>

        +
          +
        • <%= raw I18n.t 'integrations.message_gateway.instructions.1', preferences_link: link_to(t('layouts.navigation.preferences'), preferences_url), sms_email_name: Preference.human_attribute_name('sms_email'), sms_context_name: Preference.human_attribute_name('sms_context') %>
          • +
        • <%= raw I18n.t 'integrations.message_gateway.instructions.2', command: "
          /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
          " %>
          • +
        • <%= I18n.t 'integrations.message_gateway.instructions.3' %>
          • +
        +

        <%= I18n.t 'integrations.message_gateway.rich_api_tip' %>

        +

        <%= raw I18n.t 'integrations.message_gateway.configuration', site_yml: 'site.yml', to_name: 'to:', from_name: 'from:' %>

        +

        <%= raw I18n.t 'integrations.message_gateway.one_user_configuration', single_user_var_name: 'single_user', code: "

        TRACKS_MAIL_RECEIVER=" + current_user.login + " /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
        " %>

        + + +

        <%= I18n.t 'integrations.sections.mailgun' %>

        +

        <%= raw I18n.t 'integrations.mailgun.description', mailgun_link: link_to('Mailgun', 'http://www.mailgun.com/') %>

        +

        <%= I18n.t 'integrations.mailgun.conditions' %>

        +
          +
        • <%= raw I18n.t 'integrations.mailgun.instructions.1', mailgun_link: link_to('Mailgun', 'http://www.mailgun.com/') %>
          • +
        • <%= I18n.t 'integrations.mailgun.instructions.2' %>
          • +
            +
          • <%= I18n.t 'integrations.mailgun.instructions.2a' %>
            • +
          • <%= I18n.t 'integrations.mailgun.instructions.2b' %>
            • +
          +
        • <%= raw I18n.t 'integrations.mailgun.instructions.3', preferences_link: link_to(t('layouts.navigation.preferences'), preferences_url), sms_email_name: Preference.human_attribute_name('sms_email') %>
          • +
        • <%= I18n.t 'integrations.mailgun.instructions.4', sms_context_name: Preference.human_attribute_name('sms_context') %>
          • +
        • <%= I18n.t 'integrations.mailgun.instructions.5' %>
          • +
        • <%= I18n.t 'integrations.mailgun.instructions.6', code: '
          +mailmap:
+  tracks@user.mailgun.org:
+  - me@myhome.domain.net
+  - mr.user@work.company.com
+
          ' %>
          • +
        +

        <%= I18n.t 'integrations.mailgun.gateway_instructions' %>

        + + +

        <%= I18n.t 'integrations.sections.email_rich' %>

        +

        <%= I18n.t 'integrations.email_rich.description' %>

        +
        <%= I18n.t 'integrations.example_names.todo' %> @<%= I18n.t 'integrations.example_names.context' %> ~<%= I18n.t 'integrations.example_names.project' %> <131012 >131009 #<%= I18n.t 'integrations.example_names.tag.1' %> #<%= I18n.t 'integrations.example_names.tag.2' %> *
        +

        <%= I18n.t 'integrations.email_rich.fields_title' %>

        + + + + + + + + + + + + + + + + + + + + + + +
        <%= I18n.t 'integrations.email_rich.symbol_title' %><%= I18n.t 'integrations.email_rich.meaning_title' %>
        @<%= I18n.t 'integrations.email_rich.field_descriptions.context' %>
        ~<%= I18n.t 'integrations.email_rich.field_descriptions.project' %>
        <<%= I18n.t 'integrations.email_rich.field_descriptions.due_date' %>
        ><%= I18n.t 'integrations.email_rich.field_descriptions.due_date' %>
        #<%= I18n.t 'integrations.email_rich.field_descriptions.tag' %>
        *<%= I18n.t 'integrations.email_rich.field_descriptions.star' %>
        +

        <%= I18n.t 'integrations.email_rich.fields_instruction' %> diff --git a/app/views/integrations/index.nl.html.erb b/app/views/integrations/index.nl.html.erb deleted file mode 100644 index dfacaecb..00000000 --- a/app/views/integrations/index.nl.html.erb +++ /dev/null @@ -1,52 +0,0 @@ -<% has_contexts = !current_user.contexts.empty? -%> -

        Integratie

        -

        Tracks kan met een aantal tools worden geïntegreerd... - Alles om je te helpen om dingen gedaan te krijgen! - Deze pagina heeft informatie over het tot stand brengen van sommige integratievormen. - Deze voorbeelden zijn niet altijd voor alle platformen van toepassing en - sommige voorbeelden vragen meer technische kennis dan anderen - Zie ook <%= link_to "de documentatie voor ontwikkelaars met Tracks' REST API", url_for(:action => 'rest_api') %>.

        -

        Inhoud:

        -
        -

        Heb je een tip om hier toe te voegen? - Vertel ons er over in onze - Tips and Tricks forum en misschien voegen we jouw tip toe op deze pagina in een toekomstige versie van Tracks. -

        - - -

        Email jezelf automatisch de acties met een aflopende deadline

        - -

        Als je de volgende regel toevoegd aan jouw crontab, dat ontvang je een e-mail op elke dag rond 05:00 met een lijst met acties waarvan de deadline afloopt binnen de komende 7 dagen.

        - - - -

        Uiteraard kan je ook een andere <%= link_to 'text feed gebruiken die Tracks biedt', feeds_path %> -- bijvoorbeeld een email met een lijst van acties voor een specifiek project naar een groep collega's die werken aan dat project?

        - - -

        Integreer Tracks met een email server om een actie via email naar Tracks te sturen

        -

        - Als Tracks draait op dezelfde server als jouw mailserver, dan kan je de geïntegreerde mail handler gebruiken van Tracks. Om dit in te stellen: -

        -
          -
        • Ga naar <%= link_to t('layouts.navigation.preferences'), preferences_url %> - en stel in "<%= Preference.human_attribute_name('sms_email') %>" en - "<%= Preference.human_attribute_name('sms_context') %>" voor acties die - verzonden zijn via email (die bijv. komen via een SMS message)
          • -
        • In sendmail/qmail/postfix/whatever, stel een email address - alias in om berichten door te sturen naar - 
          /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
          • -
        • Verstuur een email naar het net geconfigureerde e-mail adres!
          • -
        -

        Je kan ook de Rich Todo API gebruiken om acties te maken zoals "do laundry @ Home" - of "Call Bill > project X". Het onderwerp van het bericht zal de bijschrijving van de actie vullen, - de context, en het project, terwijl de body van het bericht de notities van de actie zal vullen. -

        -

        - Het kan nodig zijn om jouw site.yml te configureren om de message gateway te laten kijken naar het to: veld of het from: veld om - de Tracks-gebruiker op te zoeken met het emailadres uit dat veld.

        -

        Je kan ook alle email naar een specifieke Tracks gebruiker sturen. Stel mail_dispatch in site.yml in op single_user en geeft de login van de gebruiker door: - 

        TRACKS_MAIL_RECEIVER=<%=current_user.login%> /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
        -

        diff --git a/app/views/preferences/_date_and_time.html.erb b/app/views/preferences/_date_and_time.html.erb index ba108cc6..3cd58db6 100644 --- a/app/views/preferences/_date_and_time.html.erb +++ b/app/views/preferences/_date_and_time.html.erb @@ -1,8 +1,8 @@ <%= pref_with_text_field('prefs', 'date_format') %> -
        This will result in: <%= l(Time.zone.today, :format => current_user.prefs.date_format) %>
        +
        <%= I18n.t('preferences.result_in') %> <%= l(Time.zone.today, :format => current_user.prefs.date_format) %>

        -Or pick one of the following:
        +<%= I18n.t('preferences.pick_one') %>
        <% [:default, :short, :long, :longer].each do |format| %>

      <%= I18n.t 'integrations.message_gateway.rich_api_tip' %>

      <%= raw I18n.t 'integrations.message_gateway.configuration', site_yml: 'site.yml', to_name: 'to:', from_name: 'from:' %>

      -

      <%= raw I18n.t 'integrations.message_gateway.one_user_configuration', single_user_var_name: 'single_user', code: "

      TRACKS_MAIL_RECEIVER=" + current_user.login + " /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
      " %>

      +

      <%= raw I18n.t 'integrations.message_gateway.one_user_configuration', single_user_value: 'single_user', code: "

      TRACKS_MAIL_RECEIVER=" + current_user.login + " /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
      " %>

      <%= I18n.t 'integrations.sections.mailgun' %>

      @@ -45,11 +45,11 @@
    • <%= raw I18n.t 'integrations.mailgun.instructions.3', preferences_link: link_to(t('layouts.navigation.preferences'), preferences_url), sms_email_name: Preference.human_attribute_name('sms_email') %>
    • <%= I18n.t 'integrations.mailgun.instructions.4', sms_context_name: Preference.human_attribute_name('sms_context') %>
    • <%= I18n.t 'integrations.mailgun.instructions.5' %>
      • -
    • <%= I18n.t 'integrations.mailgun.instructions.6', code: '
      +  
    • <%= raw I18n.t 'integrations.mailgun.instructions.6', code: '
       mailmap:
   tracks@user.mailgun.org:
-  - me@myhome.domain.net
-  - mr.user@work.company.com
+  - me@myhome.example.net
+  - mr.user@work.example.com
 
      ' %>
      •

    <%= I18n.t 'integrations.mailgun.gateway_instructions' %>

    diff --git a/config/locales/de.yml b/config/locales/de.yml index 821a400e..3e64e261 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -418,7 +418,7 @@ de: description: 'If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into tracks. Steps to set it up:' rich_api_tip: 'You can also use the Rich Todo API to send in tasks like "do laundry @ Home" or "Call Bill > project X". The subject of the message will fill description, context, and project, while the body will populate the tasks''s note.' configuration: "You may need to configure your %{site_yml} to tell the message gateway to look at the %{to_name} field or %{from_name} field to lookup Tracks' user from the email address in that field." - one_user_configuration: "You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to %{single_user_var_name} and pass the login of the user: %{code}" + one_user_configuration: "You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to %{single_user_value} and pass the login of the user in the pipe command: %{code}" instructions: '1': 'Go to %{preferences_link} and set your "%{sms_email_name}" and "%{sms_context_name}" for todos sent in via email (which could come from an SMS message)' '2': In sendmail/qmail/postfix/whatever, set up an email address alias to pipe messages to %{command} @@ -431,7 +431,7 @@ de: '1': Go to %{mailgun_link} and register for a free account. '2': "Go to 'Routes' in the Mailgun control panel, and add a new route:" '2a': "'Filter expression' should be set to 'catch_all()'" - '2b': "'Action' should be 'forward(\"http://mytracksserver.domain.com/mailgun/mime\")'" + '2b': "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\")'" '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.' '4': 'Select a default context for emails to be put in with "%{sms_context_name"' '5': "Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml'" diff --git a/config/locales/en.yml b/config/locales/en.yml index 8a322ba7..78b53eca 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -425,7 +425,7 @@ en: description: 'If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into Tracks. Steps to set it up:' rich_api_tip: 'You can also use the Rich Todo API to send in tasks like "do laundry @ Home" or "Call Bill > project X". The subject of the message will fill description, context, and project, while the body will populate the tasks''s note.' configuration: "You may need to configure your %{site_yml} to tell the message gateway to look at the %{to_name} field or %{from_name} field to lookup Tracks' user from the email address in that field." - one_user_configuration: "You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to %{single_user_var_name} and pass the login of the user: %{code}" + one_user_configuration: "You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to %{single_user_value} and pass the login of the user in the pipe command: %{code}" instructions: '1': 'Go to %{preferences_link} and set your "%{sms_email_name}" and "%{sms_context_name}" for todos sent in via email (which could come from an SMS message)' '2': In sendmail/qmail/postfix/whatever, set up an email address alias to pipe messages to %{command} @@ -438,7 +438,7 @@ en: '1': Go to %{mailgun_link} and register for a free account. '2': "Go to 'Routes' in the Mailgun control panel, and add a new route:" 2a: "'Filter expression' should be set to 'catch_all()'" - 2b: "'Action' should be 'forward(\"http://mytracksserver.domain.com/mailgun/mime\")'" + 2b: "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\")'" '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.' '4': 'Select a default context for emails to be put in with "%{sms_context_name}"' '5': "Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml'" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 6fdd01f1..a4d4d5a5 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -467,8 +467,8 @@ fi: sähköpostin kautta lisättäviä toimenpiteitä varten (jotka voisivat muodostua myös SMS-viestin perusteella) one_user_configuration: 'Voit myös merkitä kaikki saapuvat sähköpostit tietyn - Tracks-käyttäjän tehtäviksi. Muuta site.yml-tiedoston asetusta mail_dispatch - %{single_user_var_name} ja välitä käyttäjän tunnus: %{code}' + Tracks-käyttäjän toimenpiteiksi. Muuta site.yml-tiedoston asetusta email_dispatch arvoon + %{single_user_value} ja välitä käyttäjän tunnus putkituskomennossa: %{code}' configuration: Sinun täytyy ehkä muuttaa asetus %{site_yml}-tiedostossa, jotta viestiväylä osaa käyttää %{to_name}-kenttää tai %{from_name}-kenttää löytääkseen sähköpostia vastaavan Tracks-käyttäjän. diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 654bef60..5a2e9b84 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -376,7 +376,7 @@ nl: description: 'Als Tracks draait op dezelfde server als jouw mailserver, dan kan je de geïntegreerde mail handler gebruiken van Tracks. Om dit in te stellen:' rich_api_tip: 'Je kan ook de Rich Todo API gebruiken om acties te maken zoals "do laundry @ Home" of "Call Bill > project X". Het onderwerp van het bericht zal de bijschrijving van de actie vullen, de context, en het project, terwijl de body van het bericht de notities van de actie zal vullen.' configuration: "Het kan nodig zijn om jouw %{site_yml} te configureren om de message gateway te laten kijken naar het %{to_name} veld of het %{from_name} veld om de Tracks-gebruiker op te zoeken met het emailadres uit dat veld." - one_user_configuration: "Je kan ook alle email naar een specifieke Tracks gebruiker sturen. Stel mail_dispatch in site.yml in op %{single_user_var_name} en geeft de login van de gebruiker door: %{code}" + one_user_configuration: "Je kan ook alle email naar een specifieke Tracks gebruiker sturen. Stel mail_dispatch in site.yml in op %{single_user_value} en geeft de login van de gebruiker door: %{code}" instructions: '1': 'Ga naar %{preferences_link} en stel in "%{sms_email_name}" en "%{sms_context_name}" voor acties die verzonden zijn via email (die bijv. komen via een SMS message)' '2': In sendmail/qmail/postfix/whatever, stel een email address alias in om berichten door te sturen naar %{command} @@ -389,7 +389,7 @@ nl: '1': Go to %{mailgun_link} and register for a free account. '2': "Go to 'Routes' in the Mailgun control panel, and add a new route:" 2a: "'Filter expression' should be set to 'catch_all()'" - 2b: "'Action' should be 'forward(\"http://mytracksserver.domain.com/mailgun/mime\")'" + 2b: "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\")'" '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.' '4': 'Select a default context for emails to be put in with "%{sms_context_name"' '5': "Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml'" From e4275576ab633a25a631d8de960abc108d111eba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 06:25:15 +0000 Subject: [PATCH 280/767] Bump simplecov from 0.21.1 to 0.21.2 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.21.1 to 0.21.2. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.21.1...v0.21.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1ff7491f..98b065b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,7 +262,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - simplecov (0.21.1) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) From d1ce23558ab575d6e043dc717a7b705b495964d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jan 2021 05:49:11 +0000 Subject: [PATCH 281/767] Bump sanitize from 5.2.2 to 5.2.3 Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.2...v5.2.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1ff7491f..80aa7903 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -250,7 +250,7 @@ GEM parser (>= 2.7.1.5) ruby-progressbar (1.11.0) safe_yaml (1.0.5) - sanitize (5.2.2) + sanitize (5.2.3) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) From 06de71c5bbd343c833f6c93d83b1b0a22a27ff62 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 13 Jan 2021 14:27:10 +0200 Subject: [PATCH 282/767] Fix the logic for no recurring events label broken in a7d8b3c95. --- app/controllers/recurring_todos_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb index 1d6ce146..278b99d1 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -11,8 +11,8 @@ class RecurringTodosController < ApplicationController @recurring_todos = current_user.recurring_todos.active.includes(:tags, :taggings) @completed_recurring_todos = current_user.recurring_todos.completed.limit(10).includes(:tags, :taggings) - @no_recurring_todos = @recurring_todos.exists? - @no_completed_recurring_todos = @completed_recurring_todos.exists? + @no_recurring_todos = !@recurring_todos.exists? + @no_completed_recurring_todos = !@completed_recurring_todos.exists? @count = @recurring_todos.count @new_recurring_todo = RecurringTodo.new From c7ad1675470ce8d8a29e8dda0a4288f6e9328485 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 05:46:29 +0000 Subject: [PATCH 283/767] Bump listen from 3.4.0 to 3.4.1 Bumps [listen](https://github.com/guard/listen) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.4.0...v3.4.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 956e6efd..468a1f51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) libv8 (3.16.14.19) - listen (3.4.0) + listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.8.0) From c8af38ab246df1187998918f11d23996d62f06c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Jan 2021 05:44:07 +0000 Subject: [PATCH 284/767] Bump solargraph from 0.40.1 to 0.40.2 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.40.1 to 0.40.2. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.40.1...v0.40.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 468a1f51..2b9661a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,7 +177,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.20.1) - parser (2.7.2.0) + parser (3.0.0.0) ast (~> 2.4.1) pg (1.2.3) puma (5.1.1) @@ -268,7 +268,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.40.1) + solargraph (0.40.2) backport (~> 1.1) benchmark bundler (>= 1.17.2) @@ -276,7 +276,7 @@ GEM jaro_winkler (~> 1.5) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) - parser (~> 2.3) + parser (~> 3.0) reverse_markdown (>= 1.0.5, < 3) rubocop (>= 0.52) thor (~> 1.0) From e9c9c2a50a44d5371904793aaaea49d8f0e5a872 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jan 2021 05:20:55 +0000 Subject: [PATCH 285/767] Bump rubocop from 1.7.0 to 1.8.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.7.0 to 1.8.1. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.7.0...v1.8.1) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 7609b85a..562298cf 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.7', require: false + gem 'rubocop', '~> 1.8', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 2b9661a9..14545564 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,15 +237,15 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.7.0) + rubocop (1.8.1) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) + unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.4.0) parser (>= 2.7.1.5) ruby-progressbar (1.11.0) @@ -354,7 +354,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.7) + rubocop (~> 1.8) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From f771969bbeabd8eef6604e04dd916ae246aa75e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jan 2021 05:14:51 +0000 Subject: [PATCH 286/767] Bump bullet from 6.1.2 to 6.1.3 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.2 to 6.1.3. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.2...6.1.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2b9661a9..d943a0ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - bullet (6.1.2) + bullet (6.1.3) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -99,7 +99,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crass (1.0.6) database_cleaner (1.8.5) diff-lcs (1.4.4) @@ -160,7 +160,7 @@ GEM mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.5.0) - minitest (5.14.2) + minitest (5.14.3) minitest-stub-const (0.6) mocha (1.12.0) mysql2 (0.5.3) @@ -310,7 +310,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) - uniform_notifier (1.13.0) + uniform_notifier (1.13.2) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) From ad36420937ad574c93d61aaca22db6a66918facf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Jan 2021 05:38:34 +0000 Subject: [PATCH 287/767] Bump rubocop from 1.8.1 to 1.9.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.8.1 to 1.9.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.8.1...v1.9.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 562298cf..b030e8b6 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.8', require: false + gem 'rubocop', '~> 1.9', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index d98c819f..279b91d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,7 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) acts_as_list (1.0.3) activerecord (>= 4.2) - ast (2.4.1) + ast (2.4.2) autoprefixer-rails (10.1.0.0) execjs backport (1.1.2) @@ -237,7 +237,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.8.1) + rubocop (1.9.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -246,7 +246,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.0) + rubocop-ast (1.4.1) parser (>= 2.7.1.5) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -354,7 +354,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.8) + rubocop (~> 1.9) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From 376de3c06db69080ec514629edb4c094f24a6108 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Jan 2021 05:39:16 +0000 Subject: [PATCH 288/767] Bump rack-mini-profiler from 2.3.0 to 2.3.1 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d98c819f..cd963102 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,7 +184,7 @@ GEM nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) - rack-mini-profiler (2.3.0) + rack-mini-profiler (2.3.1) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) From e38d2720ea082a113059f133964506b79267dbc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Feb 2021 08:47:17 +0000 Subject: [PATCH 289/767] Bump puma from 5.1.1 to 5.2.0 Bumps [puma](https://github.com/puma/puma) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.1.1...v5.2.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b030e8b6..3cf8f8d8 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'bcrypt', '~> 3.1.16' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' gem 'htmlentities' gem 'paperclip' -gem 'puma', '~> 5.1' +gem 'puma', '~> 5.2' gem 'rails_autolink' gem 'RedCloth' gem 'sanitize', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 5fb0ed79..e8ed099a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM parser (3.0.0.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.1.1) + puma (5.2.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -347,7 +347,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 5.1) + puma (~> 5.2) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing From 3fac35ab5b773102e7d8784efa0b85a8c5b0b920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 05:37:10 +0000 Subject: [PATCH 290/767] Bump rubocop from 1.9.0 to 1.9.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.9.0 to 1.9.1. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.9.0...v1.9.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e8ed099a..1838dfaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,7 +237,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.9.0) + rubocop (1.9.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) From 95a981cb63961dce58935879e4556487685ac5ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 05:56:11 +0000 Subject: [PATCH 291/767] Bump puma from 5.2.0 to 5.2.1 Bumps [puma](https://github.com/puma/puma) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.2.0...v5.2.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e8ed099a..e0ae63ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM minitest-stub-const (0.6) mocha (1.12.0) mysql2 (0.5.3) - nio4r (2.5.4) + nio4r (2.5.5) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -180,7 +180,7 @@ GEM parser (3.0.0.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.2.0) + puma (5.2.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) From 1ca09934812d8135bd86be115906740e02da54d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 05:56:41 +0000 Subject: [PATCH 292/767] Bump solargraph from 0.40.2 to 0.40.3 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.40.2 to 0.40.3. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.40.2...v0.40.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e8ed099a..3e48accb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -268,7 +268,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.40.2) + solargraph (0.40.3) backport (~> 1.1) benchmark bundler (>= 1.17.2) @@ -298,7 +298,7 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) tolk (4.0.1) From 38ed51cc3054d049964366db165ba31823607b48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 06:36:39 +0000 Subject: [PATCH 293/767] Bump bullet from 6.1.3 to 6.1.4 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.3 to 6.1.4. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.3...6.1.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 53fefea8..00ece7e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - bullet (6.1.3) + bullet (6.1.4) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -119,7 +119,7 @@ GEM activesupport (>= 4.2.0) highline (2.0.3) htmlentities (4.3.4) - i18n (1.8.7) + i18n (1.8.9) concurrent-ruby (~> 1.0) i18n-tasks (0.9.33) activesupport (>= 4.0.2) @@ -160,7 +160,7 @@ GEM mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.5.0) - minitest (5.14.3) + minitest (5.14.4) minitest-stub-const (0.6) mocha (1.12.0) mysql2 (0.5.3) @@ -310,7 +310,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) - uniform_notifier (1.13.2) + uniform_notifier (1.14.1) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) From 7e23d1e546504663c3b78285a4da876c6394e1e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Mar 2021 05:14:11 +0000 Subject: [PATCH 294/767] Bump rubocop from 1.9.1 to 1.11.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.9.1 to 1.11.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.9.1...v1.11.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3cf8f8d8..3b4df5c2 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.9', require: false + gem 'rubocop', '~> 1.11', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 53fefea8..ecdc1f4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,7 +229,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (2.0.3) + regexp_parser (2.1.1) reverse_markdown (2.0.0) nokogiri rexml (3.2.4) @@ -237,7 +237,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.9.1) + rubocop (1.11.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -354,7 +354,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.9) + rubocop (~> 1.11) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From 46996110713252a64a7c5f51041fb14a42db4353 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Mar 2021 05:15:55 +0000 Subject: [PATCH 295/767] Bump puma from 5.2.1 to 5.2.2 Bumps [puma](https://github.com/puma/puma) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.2.1...v5.2.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 53fefea8..ea971980 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM parser (3.0.0.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.2.1) + puma (5.2.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) From 51b65f96b8a97deeb3abcb4a15d3042b52dbdb61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 05:28:45 +0000 Subject: [PATCH 296/767] Bump i18n-tasks from 0.9.33 to 0.9.34 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.33 to 0.9.34. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.33...v0.9.34) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 3b4df5c2..2e6f44d8 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ group :development do gem 'rack-mini-profiler' gem 'solargraph' - gem 'i18n-tasks', '~> 0.9.33' + gem 'i18n-tasks', '~> 0.9.34' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 20537a3c..f74b6a37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,7 @@ GEM htmlentities (4.3.4) i18n (1.8.9) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.33) + i18n-tasks (0.9.34) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -146,7 +146,7 @@ GEM listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.8.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -165,7 +165,7 @@ GEM mocha (1.12.0) mysql2 (0.5.3) nio4r (2.5.5) - nokogiri (1.11.1) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.4) @@ -291,7 +291,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - terminal-table (2.0.0) + terminal-table (3.0.0) unicode-display_width (~> 1.1, >= 1.1.1) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) @@ -338,7 +338,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.15.1) htmlentities - i18n-tasks (~> 0.9.33) + i18n-tasks (~> 0.9.34) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen From 79caae0ccc868ab2bd92358279273d375682bce5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 05:29:18 +0000 Subject: [PATCH 297/767] Bump solargraph from 0.40.3 to 0.40.4 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.40.3 to 0.40.4. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.40.3...v0.40.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 20537a3c..26d44974 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,7 +165,7 @@ GEM mocha (1.12.0) mysql2 (0.5.3) nio4r (2.5.5) - nokogiri (1.11.1) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.4) @@ -268,7 +268,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.40.3) + solargraph (0.40.4) backport (~> 1.1) benchmark bundler (>= 1.17.2) From 5b9bbee95f35a31ea4096068ba616a3fdf147f2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Mar 2021 05:29:04 +0000 Subject: [PATCH 298/767] Bump listen from 3.4.1 to 3.5.0 Bumps [listen](https://github.com/guard/listen) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.4.1...v3.5.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 20537a3c..659847ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,7 +112,7 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - ffi (1.14.2) + ffi (1.15.0) font-awesome-sass (5.15.1) sassc (>= 1.11) globalid (0.4.2) @@ -143,7 +143,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) libv8 (3.16.14.19) - listen (3.4.1) + listen (3.5.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.8.0) From 1113145cea7f3e4746edd17787b597a3d6ea8638 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Mar 2021 13:58:28 +0000 Subject: [PATCH 299/767] Bump kramdown from 2.3.0 to 2.3.1 Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/gettalong/kramdown/releases) - [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page) - [Commits](https://github.com/gettalong/kramdown/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 08f23c56..db59bd3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,7 +138,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -157,7 +157,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.14.4) From f2d0d62c3edbc1aef5eaa59d85b4408266fe53df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Mar 2021 05:14:52 +0000 Subject: [PATCH 300/767] Bump listen from 3.5.0 to 3.5.1 Bumps [listen](https://github.com/guard/listen) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.5.0...v3.5.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 08f23c56..93c33f8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) libv8 (3.16.14.19) - listen (3.5.0) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.9.0) @@ -157,7 +157,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.14.4) From 7af47c25ac65d00ded6a6d6cc5799f3d4fbd0209 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Mar 2021 08:08:27 +0000 Subject: [PATCH 301/767] Bump rubocop from 1.11.0 to 1.12.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.11.0...v1.12.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2e6f44d8..cbc9774f 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.11', require: false + gem 'rubocop', '~> 1.12', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index a0820a29..2c28e937 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -239,7 +239,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.11.0) + rubocop (1.12.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -356,7 +356,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.11) + rubocop (~> 1.12) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From f1efa6aff99424adfe05131f61c2d99a053c0556 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 05:59:57 +0000 Subject: [PATCH 302/767] Bump rubocop from 1.12.0 to 1.12.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.12.0...v1.12.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2c28e937..4b521d18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -239,7 +239,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.12.0) + rubocop (1.12.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) From 4458dfbeef640294de11b8d3952e66305d88b82b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Apr 2021 05:24:34 +0000 Subject: [PATCH 303/767] Bump acts_as_list from 1.0.3 to 1.0.4 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/brendon/acts_as_list/releases) - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.0.3...v1.0.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4b521d18..fa81d88e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts_as_list (1.0.3) + acts_as_list (1.0.4) activerecord (>= 4.2) ast (2.4.2) autoprefixer-rails (10.1.0.0) @@ -119,7 +119,7 @@ GEM activesupport (>= 4.2.0) highline (2.0.3) htmlentities (4.3.4) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) i18n-tasks (0.9.34) activesupport (>= 4.0.2) From 0d77894425eb9b92572d786b61045d244367ef35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Apr 2021 05:18:42 +0000 Subject: [PATCH 304/767] Bump rubocop from 1.12.1 to 1.13.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.12.1 to 1.13.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.12.1...v1.13.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index cbc9774f..094415e1 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.12', require: false + gem 'rubocop', '~> 1.13', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 4b521d18..2b529568 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.20.1) - parser (3.0.0.0) + parser (3.0.1.0) ast (~> 2.4.1) pg (1.2.3) puma (5.2.2) @@ -234,12 +234,12 @@ GEM regexp_parser (2.1.1) reverse_markdown (2.0.0) nokogiri - rexml (3.2.4) + rexml (3.2.5) rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.12.1) + rubocop (1.13.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -356,7 +356,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.12) + rubocop (~> 1.13) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From b6b4e7704ea9aae127a840790cd145916abdb3a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 05:16:52 +0000 Subject: [PATCH 305/767] Bump rack-mini-profiler from 2.3.1 to 2.3.2 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.1...v2.3.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4b521d18..10c1c658 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -186,7 +186,7 @@ GEM nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) - rack-mini-profiler (2.3.1) + rack-mini-profiler (2.3.2) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) From 176e2a288a915de6bd1665996edcf237f089116c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 20:49:18 +0000 Subject: [PATCH 306/767] Bump rexml from 3.2.4 to 3.2.5 Bumps [rexml](https://github.com/ruby/rexml) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.4...v3.2.5) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4b521d18..4a8c1063 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,7 +234,7 @@ GEM regexp_parser (2.1.1) reverse_markdown (2.0.0) nokogiri - rexml (3.2.4) + rexml (3.2.5) rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) From 8cc160553ca9aea31b1873c5550793305107395a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 05:54:16 +0000 Subject: [PATCH 307/767] Bump aasm from 5.1.1 to 5.2.0 Bumps [aasm](https://github.com/aasm/aasm) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/aasm/aasm/releases) - [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) - [Commits](https://github.com/aasm/aasm/compare/v5.1.1...v5.2.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 094415e1..ca2846c0 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'font-awesome-sass', '~> 5.15.1' gem 'uglifier', '>=1.3.0' -gem 'aasm', '~> 5.1.1' +gem 'aasm', '~> 5.2.0' gem 'acts_as_list' gem 'bcrypt', '~> 3.1.16' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' diff --git a/Gemfile.lock b/Gemfile.lock index af5c0cc4..f8499fc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.2) - aasm (5.1.1) + aasm (5.2.0) concurrent-ruby (~> 1.0) actioncable (6.0.3.4) actionpack (= 6.0.3.4) @@ -325,7 +325,7 @@ PLATFORMS DEPENDENCIES RedCloth - aasm (~> 5.1.1) + aasm (~> 5.2.0) actionpack-xml_parser (~> 2.0) activemodel-serializers-xml (~> 1.0.1) acts_as_list From 2afd0f45499c98bd651fc919c157783f4a7c64fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 05:16:11 +0000 Subject: [PATCH 308/767] Bump rubocop from 1.13.0 to 1.14.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.13.0...v1.14.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 094415e1..71a2673a 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.13', require: false + gem 'rubocop', '~> 1.14', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index af5c0cc4..9c1e090f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.20.1) - parser (3.0.1.0) + parser (3.0.1.1) ast (~> 2.4.1) pg (1.2.3) puma (5.2.2) @@ -239,17 +239,17 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.13.0) + rubocop (1.14.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.2.0, < 2.0) + rubocop-ast (>= 1.5.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.5.0) + parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) sanitize (5.2.3) @@ -356,7 +356,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.13) + rubocop (~> 1.14) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From e3738c52d47c74706d1ac9cc81b247bf64880668 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 May 2021 05:49:55 +0000 Subject: [PATCH 309/767] Bump puma from 5.2.2 to 5.3.2 Bumps [puma](https://github.com/puma/puma) from 5.2.2 to 5.3.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.2.2...v5.3.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 31ce5d6c..f25edea2 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'bcrypt', '~> 3.1.16' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' gem 'htmlentities' gem 'paperclip' -gem 'puma', '~> 5.2' +gem 'puma', '~> 5.3' gem 'rails_autolink' gem 'RedCloth' gem 'sanitize', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 103791c3..23f4aebc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,7 +166,7 @@ GEM minitest-stub-const (0.6) mocha (1.12.0) mysql2 (0.5.3) - nio4r (2.5.5) + nio4r (2.5.7) nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -182,7 +182,7 @@ GEM parser (3.0.1.1) ast (~> 2.4.1) pg (1.2.3) - puma (5.2.2) + puma (5.3.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -349,7 +349,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 5.2) + puma (~> 5.3) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing From df4e317e435e2e1e4bbf15dba9ae943fdffde2da Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 15 Jun 2021 23:17:43 +0300 Subject: [PATCH 310/767] Move from Freenode to Libera due to channel takeover --- README.md | 2 +- app/views/integrations/help.html.erb | 2 +- config/locales/en.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a1e3aa14..0f6ae2a6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ * Hosted services: https://github.com/TracksApp/tracks/wiki/Hosted-Tracks * Bug reports and feature requests: https://github.com/TracksApp/tracks/issues * Mailing list: http://groups.google.com/group/TracksApp -* IRC channel: #tracks on Freenode, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org) +* IRC channel: #tracks on Libera, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org) * License: See COPYING Full instructions for both new installations and upgrades from older installations diff --git a/app/views/integrations/help.html.erb b/app/views/integrations/help.html.erb index 9c527bea..913fef0b 100644 --- a/app/views/integrations/help.html.erb +++ b/app/views/integrations/help.html.erb @@ -8,5 +8,5 @@ diff --git a/config/locales/en.yml b/config/locales/en.yml index 78b53eca..5f84d4b3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -472,7 +472,7 @@ en: contribute_link_text: project website mailing_list_link_text: Mailing list irc_bullet: '%{irc_link} (also available in %{matrix_link})' - irc_link_text: 'IRC channel #Tracks@FreeNode' + irc_link_text: 'IRC channel #Tracks@Libera' matrix_link_text: Matrix layouts: mobile_navigation: From e8eb4963d5b00af5cc208bef293081ed7baacd3c Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sat, 24 Jul 2021 18:53:52 +0000 Subject: [PATCH 311/767] Simplify the workflow file This uses a matrix configuration to set up all the various configurations we're testing tracks with. It also adds testing on ruby 3.0 and testing postgres with all the various ruby versions. --- .github/workflows/continuous-integration.yml | 37 ++++---------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4ceda594..4775c47e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,38 +1,13 @@ --- name: Automated tests - on: pull_request - jobs: - test25mysql: + build: runs-on: ubuntu-latest + strategy: matrix + matrix: + ruby: ["2.5", "2.6", "2.7", "3.0"] + db: [sqlite, mysql, postgres] steps: - uses: actions/checkout@v1 - - run: bash -x script/cibuild 2.5 mysql - - test26mysql: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - run: bash -x script/cibuild 2.6 mysql - - test27mysql: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - run: bash -x script/cibuild 2.7 mysql - - test27postgres: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - run: bash -x script/cibuild 2.7 postgres - - test27sqlite: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - run: bash -x script/cibuild 2.7 sqlite - -# - run: bash -x script/cibuild 2.5 postgres -# - run: bash -x script/cibuild 2.7 postgres + - run: bash -x script/cibuild ${{ matrix.ruby }} ${{ matrix.db }} \ No newline at end of file From 9dd0ee6cefe9fcad92722330129218a46b2421ea Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sat, 24 Jul 2021 18:57:48 +0000 Subject: [PATCH 312/767] Fix the syntax errors. --- .github/workflows/continuous-integration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4775c47e..9db822b2 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -4,10 +4,10 @@ on: pull_request jobs: build: runs-on: ubuntu-latest - strategy: matrix - matrix: - ruby: ["2.5", "2.6", "2.7", "3.0"] - db: [sqlite, mysql, postgres] + strategy: + matrix: + ruby: ["2.5", "2.6", "2.7", "3.0"] + db: [sqlite, mysql, postgres] steps: - uses: actions/checkout@v1 - run: bash -x script/cibuild ${{ matrix.ruby }} ${{ matrix.db }} \ No newline at end of file From 2d20c8b40ec4883efa79b9caf01410f65b97337f Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sat, 24 Jul 2021 19:02:15 +0000 Subject: [PATCH 313/767] Only define matrices for valid test environments Removes ruby 3.0 completely and ignores sqlite and postgres for the older Ruby versions --- .github/workflows/continuous-integration.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 9db822b2..7e08a26d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -6,8 +6,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ["2.5", "2.6", "2.7", "3.0"] + ruby: ["2.5", "2.6", "2.7"] db: [sqlite, mysql, postgres] + exclude: + - ruby: "2.5" + db: [sqlite, postgres] + - ruby: "2.6" + db: [sqlite, postgres] + steps: - uses: actions/checkout@v1 - run: bash -x script/cibuild ${{ matrix.ruby }} ${{ matrix.db }} \ No newline at end of file From 076208f8041401ce16d16372f75939337338a41c Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sat, 24 Jul 2021 19:04:48 +0000 Subject: [PATCH 314/767] Be more explicit about exclusions It would seem that lists are not available for use in exclusions. If this doesn't work, then I'll switch to inclusions only. --- .github/workflows/continuous-integration.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7e08a26d..a753fd91 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -10,9 +10,13 @@ jobs: db: [sqlite, mysql, postgres] exclude: - ruby: "2.5" - db: [sqlite, postgres] + db: sqlite + - ruby: "2.5" + db: postgres - ruby: "2.6" - db: [sqlite, postgres] + db: sqlite + - ruby: "2.6" + db: postgres steps: - uses: actions/checkout@v1 From af32031002df5bc15e1a7e6c25f84c94c14cd58f Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sat, 24 Jul 2021 15:14:47 -0500 Subject: [PATCH 315/767] Fix due dates in recurring todo test --- test/models/recurring_todo_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/models/recurring_todo_test.rb b/test/models/recurring_todo_test.rb index 3e13da8b..e6535f14 100644 --- a/test/models/recurring_todo_test.rb +++ b/test/models/recurring_todo_test.rb @@ -156,10 +156,10 @@ class RecurringTodoTest < ActiveSupport::TestCase ## Test: every year # start from after june 8th 2008 - @yearly.start_from = Time.zone.local(2020,6,12) - assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(nil) # jun 8th next year - assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(Time.zone.local(2019,6,1)) # also next year - assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(Time.zone.local(2020,6,15)) # also next year + @yearly.start_from = Time.zone.local(2021,6,12) + assert_equal Time.zone.local(2022,6,8), @yearly.get_due_date(nil) # jun 8th next year + assert_equal Time.zone.local(2022,6,8), @yearly.get_due_date(Time.zone.local(2019,6,1)) # also next year + assert_equal Time.zone.local(2022,6,8), @yearly.get_due_date(Time.zone.local(2020,6,15)) # also next year this_year = Time.zone.now.utc.year @yearly.start_from = Time.zone.local(this_year+1,6,12) From 41e87ea8cdecec06e44f4fab5c30c7e7d9679744 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jul 2021 00:11:24 +0000 Subject: [PATCH 316/767] Bump rubocop from 1.14.0 to 1.18.4 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.14.0 to 1.18.4. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.14.0...v1.18.4) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index f25edea2..13131181 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.14', require: false + gem 'rubocop', '~> 1.18', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 23f4aebc..b9774872 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.20.1) - parser (3.0.1.1) + parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) puma (5.3.2) @@ -239,16 +239,16 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.14.0) + rubocop (1.18.4) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.5.0, < 2.0) + rubocop-ast (>= 1.8.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.5.0) + rubocop-ast (1.8.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -356,7 +356,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.14) + rubocop (~> 1.18) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From 83b74d43e79534c0eb69f5b83bfb575d6eb254e1 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 29 Jul 2021 13:48:42 +0300 Subject: [PATCH 317/767] Add another way of supporting --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index b81037d8..4165832c 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,3 @@ # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] custom: ['https://www.taskitin.fi/'] +github: zeip From b9a44c993fe77479598fcc42dcc038ecaa2b4125 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sun, 8 Aug 2021 20:44:54 -0500 Subject: [PATCH 318/767] re-add newline at end of file --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a753fd91..33de64c0 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -20,4 +20,4 @@ jobs: steps: - uses: actions/checkout@v1 - - run: bash -x script/cibuild ${{ matrix.ruby }} ${{ matrix.db }} \ No newline at end of file + - run: bash -x script/cibuild ${{ matrix.ruby }} ${{ matrix.db }} From 15c63bdf8fe529ebc1260d807cd89c4f7d8bea8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 08:46:52 +0000 Subject: [PATCH 319/767] Bump mocha from 1.12.0 to 1.13.0 Bumps [mocha](https://github.com/freerange/mocha) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/freerange/mocha/releases) - [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md) - [Commits](https://github.com/freerange/mocha/compare/v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: mocha dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 23f4aebc..6bb90eb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM mini_portile2 (2.5.0) minitest (5.14.4) minitest-stub-const (0.6) - mocha (1.12.0) + mocha (1.13.0) mysql2 (0.5.3) nio4r (2.5.7) nokogiri (1.11.2) @@ -179,7 +179,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.20.1) - parser (3.0.1.1) + parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) puma (5.3.2) @@ -239,16 +239,16 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.14.0) + rubocop (1.18.4) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.5.0, < 2.0) + rubocop-ast (>= 1.8.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.5.0) + rubocop-ast (1.8.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -356,7 +356,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.14) + rubocop (~> 1.18) sanitize (~> 5.2) sassc-rails (~> 2.1.2) simplecov From a7cdccd1c586991d3956f7bc25ec2257133f44cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 08:49:00 +0000 Subject: [PATCH 320/767] Bump nokogiri from 1.11.2 to 1.12.2 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.12.2. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.12.2) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b9774872..2659b84b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -161,14 +161,14 @@ GEM nokogiri (~> 1) rake mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_portile2 (2.6.1) minitest (5.14.4) minitest-stub-const (0.6) mocha (1.12.0) mysql2 (0.5.3) nio4r (2.5.7) - nokogiri (1.11.2) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.2) + mini_portile2 (~> 2.6.1) racc (~> 1.4) nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) From ab70445215ee9393454a71549da34d72cd37c297 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 08:49:10 +0000 Subject: [PATCH 321/767] Bump factory_bot_rails from 6.1.0 to 6.2.0 Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases) - [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md) - [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.1.0...v6.2.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b9774872..b20c305c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) crass (1.0.6) database_cleaner (1.8.5) diff-lcs (1.4.4) @@ -107,10 +107,10 @@ GEM e2mmap (0.1.0) erubi (1.10.0) execjs (2.7.0) - factory_bot (6.1.0) + factory_bot (6.2.0) activesupport (>= 5.0.0) - factory_bot_rails (6.1.0) - factory_bot (~> 6.1.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) railties (>= 5.0.0) ffi (1.15.0) font-awesome-sass (5.15.1) @@ -146,7 +146,7 @@ GEM listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.9.0) + loofah (2.11.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -161,14 +161,14 @@ GEM nokogiri (~> 1) rake mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_portile2 (2.6.1) minitest (5.14.4) minitest-stub-const (0.6) mocha (1.12.0) mysql2 (0.5.3) nio4r (2.5.7) - nokogiri (1.11.2) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.2) + mini_portile2 (~> 2.6.1) racc (~> 1.4) nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) @@ -226,7 +226,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.3) + rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) From da6344989fcae2c071b88e229b68338d33f49310 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 10 Jan 2021 23:41:30 +0000 Subject: [PATCH 322/767] Translated using Weblate (Finnish) Currently translated at 99.8% (1068 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/ --- config/locales/fi.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/config/locales/fi.yml b/config/locales/fi.yml index a4d4d5a5..3415f5e8 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -130,9 +130,8 @@ fi: none: Ei not_available_abbr: ei note: - one: 1 muistiinpano - other: "%{count} muistiinpanoa" - zero: ei muistiinpanoja + one: ei muistiinpanoja + other: 1 muistiinpano notes: Muistiinpanot numbered_step: Askel %{number} ok: Ok @@ -424,7 +423,7 @@ fi: %{sms_context_name} -kentällä '3': Siirry %{preferences_link} ja syötä Mailgun-sähköpostiosoitteesi (esim. tracks@käyttäjä.mailgun.com) %{sms_email_name} -kenttään. - 2b: Action-kohtaan merkitään ”forward("http://palvelimeni.example.org/mailgun/mime")” + 2b: Action-kohtaan merkitään ”forward("http://palvelimeni.example.com/mailgun/mime")” 2a: "'Filter expression' asetetaan arvoon 'catch_all()'" '2': 'Mene Mailgunin ohjauspaneelin Routes-kohtaan ja lisää uusi reitti:' gateway_instructions: Kaikki ylläolevat maininnat sähköpostin muotoilusta pätevät @@ -467,8 +466,9 @@ fi: sähköpostin kautta lisättäviä toimenpiteitä varten (jotka voisivat muodostua myös SMS-viestin perusteella) one_user_configuration: 'Voit myös merkitä kaikki saapuvat sähköpostit tietyn - Tracks-käyttäjän toimenpiteiksi. Muuta site.yml-tiedoston asetusta email_dispatch arvoon - %{single_user_value} ja välitä käyttäjän tunnus putkituskomennossa: %{code}' + Tracks-käyttäjän toimenpiteiksi. Muuta site.yml-tiedoston asetusta email_dispatch + arvoon %{single_user_value} ja välitä käyttäjän tunnus putkituskomennossa: + %{code}' configuration: Sinun täytyy ehkä muuttaa asetus %{site_yml}-tiedostossa, jotta viestiväylä osaa käyttää %{to_name}-kenttää tai %{from_name}-kenttää löytääkseen sähköpostia vastaavan Tracks-käyttäjän. @@ -1330,12 +1330,10 @@ fi: multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta single_page: - one: Näytetään 1 %{model} - other: Näytetään kaikki %{count} %{model} - zero: '%{model} ei löytynyt' + one: '%{model} ei löytynyt' + other: Näytetään 1 %{model} single_page_html: - one: Näytetään 1 %{model} - other: Näytetään kaikki %{count} %{model} - zero: '%{model} ei löytynyt' + one: '%{model} ei löytynyt' + other: Näytetään 1 %{model} page_gap: "…" previous_label: "← Edellinen" From 739bb7a331e4751f9432efba134fac468e1a3c3f Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 10 Jan 2021 23:48:44 +0000 Subject: [PATCH 323/767] Translated using Weblate (English) Currently translated at 99.3% (1063 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/en/ --- config/locales/en.yml | 134 ++++++++++++++++++++++++++---------------- 1 file changed, 84 insertions(+), 50 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 5f84d4b3..023bfc74 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -95,9 +95,8 @@ en: action: Action actions: Actions actions_midsentence: - one: action - other: actions - zero: actions + one: actions + other: action add: Add ajaxError: There was an error retrieving from server back: Back @@ -109,9 +108,8 @@ en: contribute: Contribute create: Create days_midsentence: - one: day - other: days - zero: days + one: days + other: day deferred: deferred description: Description drag_handle: DRAG @@ -130,9 +128,8 @@ en: none: None not_available_abbr: n/a note: - one: 1 note - other: "%{count} notes" - zero: no notes + one: no notes + other: 1 note notes: Notes numbered_step: Step %{number} ok: Ok @@ -204,7 +201,8 @@ en: some: Some errors occurred during import file_blank: File can't be blank invalid_csv: "Invalid CSV: could not read headers: %{e}" - save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write to the upload directory? %{e}" + save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write\ + \ to the upload directory? %{e}" map_title: Map fields to be imported header: Importing data submit: Import @@ -215,21 +213,29 @@ en: projects_count: "%{count} Projects imported" todos_count: "%{count} Todos imported" yaml_disabled: "YAML loading is disabled" - yaml_warning: "%{warning}: all your current data will be destroyed before importing the YAML file, so if you have access to the database, we strongly recommend backing up the database right now in case that anything goes wrong." - paste_field: "Paste the contents of the YAML file you exported into the text box below:" + yaml_warning: "%{warning}: all your current data will be destroyed before importing\ + \ the YAML file, so if you have access to the database, we strongly recommend\ + \ backing up the database right now in case that anything goes wrong." + paste_field: "Paste the contents of the YAML file you exported into the text\ + \ box below:" warning: Beware export: page_title: Tracks::Export title: Exporting data format_header: "You can choose between the following formats:" yaml_description: "%{yaml}: Best for exporting data." - yaml_link_description: YAML file containing all your actions, contexts, projects, tags and notes - yaml_experimental: "Please note that importing YAML files is currently supported only in experimentally. Do not rely on it for backing up critical data." - csv_description: "%{csv}: Best for importing into spreadsheet or data analysis software" - csv_actions_description: CSV file containing all of your actions, with named contexts and projects + yaml_link_description: YAML file containing all your actions, contexts, projects, + tags and notes + yaml_experimental: "Please note that importing YAML files is currently supported\ + \ only in experimentally. Do not rely on it for backing up critical data." + csv_description: "%{csv}: Best for importing into spreadsheet or data analysis\ + \ software" + csv_actions_description: CSV file containing all of your actions, with named + contexts and projects csv_notes_description: CSV file containing all your notes xml_description: "%{xml}: Best for importing or repurposing the data" - xml_link_description: XML file containing all your actions, contexts, projects, tags and notes + xml_link_description: XML file containing all your actions, contexts, projects, + tags and notes download_link: Download link yaml_link_title: YAML file csv_actions_title: CSV file (actions, contexts and projects) @@ -310,13 +316,11 @@ en: other: almost %{count} years half_a_minute: half a minute less_than_x_minutes: - one: less than a minute - other: less than %{count} minutes - zero: less than 1 minute + one: less than 1 minute + other: less than a minute less_than_x_seconds: one: less than 1 second - other: less than %{count} seconds - zero: less than 1 second + other: less than 1 second over_x_years: one: over 1 year other: over %{count} years @@ -407,52 +411,81 @@ en: integrations: sections: automatic_email: Automatically Email Yourself Upcoming Actions - message_gateway: Integrate Tracks with an email server to be able to send an action through email to Tracks + message_gateway: Integrate Tracks with an email server to be able to send an + action through email to Tracks mailgun: Send emails to Tracks with Mailgun email_rich: Rich Todo Message email format opensearch_description: Search in Tracks title: Integrations - intro: "Tracks can be integrated with a number of other tools... whatever it takes to help you get things done! This page has information on setting up some of these. Not all of these are applicable to all platforms, and some require more technical knowledge than others. See also %{documentation_link}" + intro: "Tracks can be integrated with a number of other tools… whatever it takes\ + \ to help you get things done! This page has information on setting up some\ + \ of these. Not all of these are applicable to all platforms, and some require\ + \ more technical knowledge than others. See also %{documentation_link}" developer_documentation_link: developer documentation for Tracks contents_header: "Contents:" - add_your_own: Do you have one of your own to add? %{tell_us_link} and we may include it on this page in a future versions of Tracks. + add_your_own: Do you have one of your own to add? %{tell_us_link} and we may include + it on this page in a future versions of Tracks. tell_us_link_text: Tell us about it in our issue queue - cron_1: If you enter the following entry to your crontab, you will receive email every day around 5 AM with a list of the upcoming actions which are due within the next 7 days. - cron_2: You can of course use other text %{feeds_link} – why not email a list of next actions in a particular project to a group of colleagues who are working on the project? + cron_1: If you enter the following entry to your crontab, you will receive email + every day around 5 AM with a list of the upcoming actions which are due within + the next 7 days. + cron_2: You can of course use other text %{feeds_link} – why not email a list + of next actions in a particular project to a group of colleagues who are working + on the project? cron_email_subject: Tracks actions due in the next 7 days feeds_link_text: feeds provided by Tracks message_gateway: - description: 'If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into Tracks. Steps to set it up:' - rich_api_tip: 'You can also use the Rich Todo API to send in tasks like "do laundry @ Home" or "Call Bill > project X". The subject of the message will fill description, context, and project, while the body will populate the tasks''s note.' - configuration: "You may need to configure your %{site_yml} to tell the message gateway to look at the %{to_name} field or %{from_name} field to lookup Tracks' user from the email address in that field." - one_user_configuration: "You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to %{single_user_value} and pass the login of the user in the pipe command: %{code}" + description: 'If Tracks is running on the same server as your mail server, you + can use the integrated mail handler built into Tracks. Steps to set it up:' + rich_api_tip: 'You can also use the Rich Todo API to send in tasks like "do + laundry @ Home" or "Call Bill > project X". The subject of the message will + fill description, context, and project, while the body will populate the tasks''s + note.' + configuration: "You may need to configure your %{site_yml} to tell the message\ + \ gateway to look at the %{to_name} field or %{from_name} field to lookup\ + \ Tracks' user from the email address in that field." + one_user_configuration: "You can also send all email to a specific Tracks user.\ + \ Configure mail_dispatch in site.yml to %{single_user_value} and pass the\ + \ login of the user in the pipe command: %{code}" instructions: - '1': 'Go to %{preferences_link} and set your "%{sms_email_name}" and "%{sms_context_name}" for todos sent in via email (which could come from an SMS message)' - '2': In sendmail/qmail/postfix/whatever, set up an email address alias to pipe messages to %{command} + '1': 'Go to %{preferences_link} and set your "%{sms_email_name}" and "%{sms_context_name}" + for todos sent in via email (which could come from an SMS message)' + '2': In sendmail/qmail/postfix/whatever, set up an email address alias to + pipe messages to %{command} '3': Send an email to your newly configured address! mailgun: - description: If you want to email tasks to Tracks, but cannot run a mailserver on the same host, you could use the %{mailgun_link} support built in to Tracks. - conditions: For this to work your Tracks server will need to be reachable from the internet, so that Mailgun can POST data to it. - gateway_instructions: All the comments about the email format from the section above apply to the Mailgun handling, as the data is processed the same way + description: If you want to email tasks to Tracks, but cannot run a mailserver + on the same host, you could use the %{mailgun_link} support built in to Tracks. + conditions: For this to work your Tracks server will need to be reachable from + the internet, so that Mailgun can POST data to it. + gateway_instructions: All the comments about the email format from the section + above apply to the Mailgun handling, as the data is processed the same way instructions: '1': Go to %{mailgun_link} and register for a free account. '2': "Go to 'Routes' in the Mailgun control panel, and add a new route:" 2a: "'Filter expression' should be set to 'catch_all()'" - 2b: "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\")'" - '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.' + 2b: "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\"\ + )'" + '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address + (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.' '4': 'Select a default context for emails to be put in with "%{sms_context_name}"' '5': "Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml'" - '6': "Update the mailmap in 'site.yml' to define which senders can send emails to which incoming addresses. For example, to send emails from your work and home email accounts to your Tracks Mailgun route, set it up like this: %{code}" + '6': "Update the mailmap in 'site.yml' to define which senders can send emails\ + \ to which incoming addresses. For example, to send emails from your work\ + \ and home email accounts to your Tracks Mailgun route, set it up like this:\ + \ %{code}" email_rich: description: "For both of the above methods, the follow format can be used:" fields_title: "The fields are:" symbol_title: Symbol meaning_title: Meaning - fields_instruction: All symbols are optional, and text up to the first symbol (or end of string) is used as the description of the todo + fields_instruction: All symbols are optional, and text up to the first symbol + (or end of string) is used as the description of the todo field_descriptions: context: The context to place the Todo in project: The project to place the Todo in - due_date: The due date for the Todo (may be 2 digits for day, 4 digits for month-day, or 6 digits for year-month-day) + due_date: The due date for the Todo (may be 2 digits for day, 4 digits for + month-day, or 6 digits for year-month-day) tag: A tag to apply to the Todo – may be used multiple times star: Flag to star the Todo example_names: @@ -464,11 +497,14 @@ en: '2': tag2 help: title: Help - usage: 'You can find information on the usage in the %{manual_link} in the project GitHub wiki.' + usage: 'You can find information on the usage in the %{manual_link} in the project + GitHub wiki.' manual_link_text: User manual - bugs: 'If you encounter a bug or have a feature request, please report it in the %{issue_link}.' + bugs: 'If you encounter a bug or have a feature request, please report it in the + %{issue_link}.' issue_link_text: issue queue - contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} for further information. You can also come discuss with the community:' + contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} + for further information. You can also come discuss with the community:' contribute_link_text: project website mailing_list_link_text: Mailing list irc_bullet: '%{irc_link} (also available in %{matrix_link})' @@ -1283,12 +1319,10 @@ en: multi_page_html: Displaying %{model} %{from} - %{to} of %{count} in total single_page: - one: Displaying 1 %{model} - other: Displaying all %{count} %{model} - zero: No %{model} found + one: No %{model} found + other: Displaying 1 %{model} single_page_html: - one: Displaying 1 %{model} - other: Displaying all %{count} %{model} - zero: No %{model} found + one: No %{model} found + other: Displaying 1 %{model} page_gap: "…" previous_label: "← Previous" From a7b1499e6de9df865e1045862b51ddd168e5551d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 10 Jan 2021 23:48:16 +0000 Subject: [PATCH 324/767] Translated using Weblate (Finnish) Currently translated at 99.9% (1069 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/ --- config/locales/fi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 3415f5e8..bab78b4a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1043,7 +1043,7 @@ fi: completed_today: Valmistunut tänään confirm_delete: Oletko varma että haluat poistaa toimenpiteen ”%{description}”? context_changed: Asiayhteys vaihdettu %{name} - convert_to_project: Tee projekti + convert_to_project: Muuta projektiksi defer_date_after_due_date: Lykkäyspäivä on määräpäivän jälkeen. Muuta määräpäivää ennen lykkäämistä. defer_x_days: From 9d8f5834d6d5de38e6ca7205e85f1b9ed4386a5b Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Sun, 17 Jan 2021 01:38:00 +0000 Subject: [PATCH 325/767] Translated using Weblate (German) Currently translated at 96.9% (1037 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/de/ --- config/locales/de.yml | 171 ++++++++++++++++++++++++++---------------- 1 file changed, 105 insertions(+), 66 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 3e64e261..90e429bc 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -25,6 +25,7 @@ de: title_date_format: Titel Datumsformat verbose_action_descriptors: Ausführliche Aufgabenbeschreibungen week_starts: Woche startet am + theme: Aussehen project: default_context_name: Standard Kontext default_tags: Standard Tags @@ -48,6 +49,8 @@ de: login: Login open_id_url: OpenID URL password: Password + last_login_at: Letzter Login am + created_at: Erstellt am errors: full_messages: format: "%{attribute} %{message}" @@ -91,9 +94,8 @@ de: action: Aufgabe actions: Aufgaben actions_midsentence: - one: Aufgaben - other: Aufgabe - zero: Aufgabe + one: Aufgabe + other: Aufgaben add: Hinzufügen ajaxError: Fehler beim Empfangen vom Server back: Zurück @@ -105,9 +107,8 @@ de: contribute: Mitwirken create: Erstellen days_midsentence: - one: Tag - other: Tagen - zero: Tagen + one: Tagen + other: Tag deferred: aufgeschobene description: Beschreibung drag_handle: Verschieben @@ -126,9 +127,8 @@ de: none: Keine not_available_abbr: n/b note: - one: 1 Notiz - other: "%{count} Notizen" - zero: keine Notizen + one: keine Notizen + other: 1 Notiz notes: Notizen numbered_step: Schritt %{number} ok: Ok @@ -169,7 +169,7 @@ de: context_state: Context state delete_context: Kontext löschen delete_context_confirmation: Soll der Kontext '%{name}' wirklich gelöscht werden? - Alle (wiederkehrenden) Aufgaben dieses Kontexts werden hierdurch ebenfalls gelöscht. + Alle (wiederkehrenden) Aufgaben dieses Kontexts werden hierdurch ebenfalls gelöscht! delete_context_title: Kontext löschen edit_context: Kontext bearbeiten hidden_contexts: Versteckte Kontexte @@ -196,10 +196,11 @@ de: import: errors: invalid_destination: "Invalid import destination: %{e}" - some: Beim Import sind Fehler aufgetreten. + some: Beim Import sind Fehler aufgetreten file_blank: File can't be blank invalid_csv: "Invalid CSV: could not read headers: %{e}" - save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write to the upload directory? %{e}" + save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write\ + \ to the upload directory? %{e}" map_title: Map fields to be imported header: Importing data submit: Importieren @@ -210,21 +211,30 @@ de: projects_count: "%{count} Projects imported" todos_count: "%{count} Todos imported" yaml_disabled: "YAML loading is disabled" - yaml_warning: "%{warning}: vor dem Import der YAML Datei werden alle Daten in Ihrer Datenbank gelöscht. Falls Sie entsprechenden Zugriff auf Ihre Datenbank haben, empfiehlt es sich, ein Backup anzulegen, bevor Sie fortfahren." - paste_field: "Fügen Sie den Inhalt der kopierten YAML Datei in das untenstehende Formular ein:" + yaml_warning: "%{warning}: vor dem Import der YAML Datei werden alle Daten in\ + \ Ihrer Datenbank gelöscht. Falls Sie entsprechenden Zugriff auf Ihre Datenbank\ + \ haben, empfiehlt es sich, ein Backup anzulegen, bevor Sie fortfahren." + paste_field: "Fügen Sie den Inhalt der kopierten YAML Datei in das untenstehende\ + \ Formular ein:" warning: Vorsicht export: page_title: Tracks::Export title: Daten exportieren format_header: "Sie können zwischen den folgenden Formaten wählen:" yaml_description: "%{yaml}: Für den Daten-Import bevorzugt." - yaml_link_description: YAML-Datei mit all Ihren Aktionen, Umgebungen, Projekten, Tags und Notizen - yaml_experimental: "Bitte beachten Sie, dass der YAML-Import zur Zeit noch experimentelle Funktionalität darstellt. Nutzen Sie diese Option also nicht. um kritische Daten zu sichern." - csv_description: "%{csv}: Am besten für den Export in eine Tabellen-Kalkulation oder ähnliche Auswertungs-Software geeignet" - csv_actions_description: CSV-Datei mit all Ihren Aktionen, benannten Umgebungen und Projekten + yaml_link_description: YAML-Datei mit all Ihren Aktionen, Umgebungen, Projekten, + Tags und Notizen + yaml_experimental: "Bitte beachten Sie, dass der YAML-Import zur Zeit noch experimentelle\ + \ Funktionalität darstellt. Nutzen Sie diese Option also nicht. um kritische\ + \ Daten zu sichern." + csv_description: "%{csv}: Am besten für den Export in eine Tabellen-Kalkulation\ + \ oder ähnliche Auswertungs-Software geeignet" + csv_actions_description: CSV-Datei mit all Ihren Aktionen, benannten Umgebungen + und Projekten csv_notes_description: CSV-Datei mit all Ihren Notizen xml_description: "%{xml}: Am besten für den Daten-Import oder automatische Weiterverarbeitung" - xml_link_description: XML-Datei mit all Ihren Aktionen, Umgebungen, Projekten, Tags und Notizen + xml_link_description: XML-Datei mit all Ihren Aktionen, Umgebungen, Projekten, + Tags und Notizen download_link: Download link yaml_link_title: YAML Datei csv_actions_title: CSV Dile (Aktionen, Umgebungen und Projekte) @@ -305,13 +315,11 @@ de: other: fast %{count} Jahre half_a_minute: eine halbe Minute less_than_x_minutes: - one: weniger als eine Minute - other: weniger als %{count} Minuten - zero: weniger als 1 Minute + one: weniger als 1 Minute + other: weniger als eine Minute less_than_x_seconds: one: weniger als 1 Sekunde - other: weniger als %{count} Sekunden - zero: weniger als 1 Sekunde + other: weniger als 1 Sekunde over_x_years: one: mehr als 1 Jahr other: mehr als %{count} Jahre @@ -337,11 +345,11 @@ de: errors: format: "%{attribute} %{message}" messages: - accepted: должен быть подтвержден - blank: должна быть заполнена - confirmation: не соответствует %{attribute} - empty: не может быть пустым - equal_to: должно равняться %{count} + accepted: muss akzeptiert werden + blank: kann nicht leer sein + confirmation: stimmt nicht überein mit %{attribute} + empty: kann nicht leer sein + equal_to: muss %{count} sein even: должно быть четным exclusion: зарезервированно greater_than: должно быть больше %{count} @@ -400,52 +408,82 @@ de: integrations: sections: automatic_email: Anstehende Aufgaben automatisch sich via E-Mail zusenden lassen - message_gateway: Tracks mit einem Mail-Server integrieren, um Aufgaben via E-Mail zu erstellen + message_gateway: Tracks mit einem Mail-Server integrieren, um Aufgaben via E-Mail + zu erstellen mailgun: Send emails to Tracks with Mailgun email_rich: Rich Todo Message email format opensearch_description: In Tracks suchen title: Integration - intro: "Tracks kann mit verschiedenen Werkzeugen zusammenarbeiten... was immer Sie brauchen, um Ihre Aufgaben zu erledigen! Auf dieser Seite finden Sie Informationen, um einige dieser Werkzeuge einzurichten. Diese Beispiele sind nicht unbedingt auf Ihre Umgebung anwendbar oder bedürfen mehr technisches Wissen als andere. Weitere Informationen finden Sie in der %{documentation_link} (englisch)." + intro: "Tracks kann mit verschiedenen Werkzeugen zusammenarbeiten... was immer\ + \ Sie brauchen, um Ihre Aufgaben zu erledigen! Auf dieser Seite finden Sie Informationen,\ + \ um einige dieser Werkzeuge einzurichten. Diese Beispiele sind nicht unbedingt\ + \ auf Ihre Umgebung anwendbar oder bedürfen mehr technisches Wissen als andere.\ + \ Weitere Informationen finden Sie in der %{documentation_link} (englisch)." developer_documentation_link: "Entwickler Documentation der Tracks' REST API" contents_header: "Inhalt:" - add_your_own: Sie haben weitere Beispiele? %{tell_us_link}, damit wir es für die nächsten Versionen berücksichtigen können. + add_your_own: Sie haben weitere Beispiele? %{tell_us_link}, damit wir es für die + nächsten Versionen berücksichtigen können. tell_us_link_text: Berichten Sie uns in unserem issue queue - cron_1: If you enter the following entry to your crontab, you will receive email every day around 5 AM with a list of the upcoming actions which are due within the next 7 days. - cron_2: You can of course use other text %{feeds_link} – why not email a list of next actions in a particular project to a group of colleagues who are working on the project? + cron_1: If you enter the following entry to your crontab, you will receive email + every day around 5 AM with a list of the upcoming actions which are due within + the next 7 days. + cron_2: You can of course use other text %{feeds_link} – why not email a list + of next actions in a particular project to a group of colleagues who are working + on the project? cron_email_subject: Tracks actions due in the next 7 days feeds_link_text: feeds provided by Tracks message_gateway: - description: 'If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into tracks. Steps to set it up:' - rich_api_tip: 'You can also use the Rich Todo API to send in tasks like "do laundry @ Home" or "Call Bill > project X". The subject of the message will fill description, context, and project, while the body will populate the tasks''s note.' - configuration: "You may need to configure your %{site_yml} to tell the message gateway to look at the %{to_name} field or %{from_name} field to lookup Tracks' user from the email address in that field." - one_user_configuration: "You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to %{single_user_value} and pass the login of the user in the pipe command: %{code}" + description: 'If Tracks is running on the same server as your mail server, you + can use the integrated mail handler built into tracks. Steps to set it up:' + rich_api_tip: 'You can also use the Rich Todo API to send in tasks like "do + laundry @ Home" or "Call Bill > project X". The subject of the message will + fill description, context, and project, while the body will populate the tasks''s + note.' + configuration: "You may need to configure your %{site_yml} to tell the message\ + \ gateway to look at the %{to_name} field or %{from_name} field to lookup\ + \ Tracks' user from the email address in that field." + one_user_configuration: "You can also send all email to a specific Tracks user.\ + \ Configure mail_dispatch in site.yml to %{single_user_value} and pass the\ + \ login of the user in the pipe command: %{code}" instructions: - '1': 'Go to %{preferences_link} and set your "%{sms_email_name}" and "%{sms_context_name}" for todos sent in via email (which could come from an SMS message)' - '2': In sendmail/qmail/postfix/whatever, set up an email address alias to pipe messages to %{command} + '1': 'Go to %{preferences_link} and set your "%{sms_email_name}" and "%{sms_context_name}" + for todos sent in via email (which could come from an SMS message)' + '2': In sendmail/qmail/postfix/whatever, set up an email address alias to + pipe messages to %{command} '3': Send an email to your newly configured address! mailgun: - description: If you want to email tasks to Tracks, but cannot run a mailserver on the same host, you could use the %{mailgun_link} support built in to Tracks. - conditions: For this to work your Tracks server will need to be reachable from the internet, so that Mailgun can POST data to it. - gateway_instructions: All the comments about the email format from the section above apply to the Mailgun handling, as the data is processed the same way + description: If you want to email tasks to Tracks, but cannot run a mailserver + on the same host, you could use the %{mailgun_link} support built in to Tracks. + conditions: For this to work your Tracks server will need to be reachable from + the internet, so that Mailgun can POST data to it. + gateway_instructions: All the comments about the email format from the section + above apply to the Mailgun handling, as the data is processed the same way instructions: '1': Go to %{mailgun_link} and register for a free account. '2': "Go to 'Routes' in the Mailgun control panel, and add a new route:" '2a': "'Filter expression' should be set to 'catch_all()'" - '2b': "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\")'" - '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.' + '2b': "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\"\ + )'" + '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address + (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.' '4': 'Select a default context for emails to be put in with "%{sms_context_name"' '5': "Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml'" - '6': "Update the mailmap in 'site.yml' to define which senders can send emails to which incoming addresses. For example, to send emails from your work and home email accounts to your tracks Mailgun route, set it up like this: %{code}" + '6': "Update the mailmap in 'site.yml' to define which senders can send emails\ + \ to which incoming addresses. For example, to send emails from your work\ + \ and home email accounts to your tracks Mailgun route, set it up like this:\ + \ %{code}" email_rich: description: "For both of the above methods, the follow format can be used:" fields_title: "The fields are:" symbol_title: Symbol meaning_title: Meaning - fields_instruction: All symbols are optional, and text up to the first symbol (or end of string) is used as the description of the todo + fields_instruction: All symbols are optional, and text up to the first symbol + (or end of string) is used as the description of the todo field_descriptions: context: The context to place the Todo in project: The project to place the Todo in - due_date: The due date for the Todo (may be 2 digits for day, 4 digits for month-day, or 6 digits for year-month-day) + due_date: The due date for the Todo (may be 2 digits for day, 4 digits for + month-day, or 6 digits for year-month-day) tag: A tag to apply to the Todo – may be used multiple times star: Flag to star the Todo example_names: @@ -457,11 +495,14 @@ de: '2': tag2 help: title: Help - usage: 'You can find information on the usage in the %{manual_link} in the project GitHub wiki.' + usage: 'You can find information on the usage in the %{manual_link} in the project + GitHub wiki.' manual_link_text: User manual - bugs: 'If you encounter a bug or have a feature request, please report it in the %{issue_link}.' + bugs: 'If you encounter a bug or have a feature request, please report it in the + %{issue_link}.' issue_link_text: issue queue - contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} for further information. You can also come discuss with the community:' + contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} + for further information. You can also come discuss with the community:' contribute_link_text: project website mailing_list_link_text: Mailing list irc_bullet: '%{irc_link} (also available in %{matrix_link})' @@ -585,7 +626,7 @@ de: delete_note_title: Notiz '%{id}' löschen deleted_note: Notiz '%{id}' löschen edit_item_title: Eintrag bearbeiten - in_project: 'In:' + in_project: 'In: ' no_notes_available: Derzeit gibt es keine Notizen. Füge Notizen auf der jeweiligen Projektseite hinzu. note_header: Notiz %{id} @@ -654,7 +695,7 @@ de: alte Token verwendet. is_false: Nein is_true: Ja - open_id_url: 'Deine OpenID-URL lautet:' + open_id_url: 'Deine OpenID-URL lautet' page_title: TRACKS::Einstellungen page_title_edit: TRACKS::Einstellungen ändern password_changed: Ihr Passwort geändert wurde, melden Sie sich bitte wieder an. @@ -715,7 +756,7 @@ de: page_title: 'TRACKS::Projekt: %{project}' project_destroyed_status: Projekt „%{name}“ gelöscht project_saved_status: Projekt gespeichert - project_state: Projekt ist %{state} + project_state: Projekt ist %{state}. set_default_tags_notice: Standard-Tags des Projekts auf %{default_tags} setzen settings: Einstellungen show_form: Projekt erstellen @@ -816,7 +857,7 @@ de: day_of_week: Tag der Woche number_of_actions: Anzahl der Aufgaben actions_dow_30days_title: Wochentag (letzte 30 Tage) - actions_further: und danach + actions_further: ' und danach' actions_last_year: Aufgaben im letzten Jahr actions_last_year_legend: months_ago: Monate zuvor @@ -825,7 +866,7 @@ de: actions_min_completion_time: Die minimale Zeit beträgt %{time}. actions_min_max_completion_days: Das Minimum/Maximum in Tagen zur Erledigung ist %{min}/%{max}. - actions_selected_from_week: Aufgaben ausgewählt ab Woche + actions_selected_from_week: 'Aufgaben ausgewählt ab Woche ' click_to_return: Klick auf %{link} um zur Statistikseite zurückzukehren. click_to_return_link: hier click_to_show_actions_from_week: Klick auf %{link} um die Aufgaben von Woche %{week} @@ -915,9 +956,9 @@ 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: @@ -1142,7 +1183,7 @@ de: every_n: jeden %{n} every_n_days: every %{n} days every_n_months: every %{n} months - every_xth_day_of_every_n_months: jedes %{x} %{day} jedes %{n_months} ? + every_xth_day_of_every_n_months: jeder %{x} %{day} jedes %{n_months} every_year_on: jedes Jahr in %{date} first: erste fourth: vierte @@ -1286,12 +1327,10 @@ de: multi_page_html: Angezeigte %{model} %{from} - %{to} von %{count} insgesamt single_page: - one: Angezeigte 1 %{model} - other: Anzeige aller %{count} %{model} - zero: Kein %{model} gefunden + one: Kein %{model} gefunden + other: Angezeigte 1 %{model} single_page_html: - one: Angezeigte 1 %{model} - other: Anzeige aller %{count} %{model} - zero: Kein %{model} gefunden + one: Kein %{model} gefunden + other: Angezeigte 1 %{model} page_gap: "..." previous_label: "« Zurück" From cbb1fa1365de39167908a2744493901ea059a8fc Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 19 Jan 2021 10:34:13 +0100 Subject: [PATCH 326/767] Added translation using Weblate (Turkish) --- config/locales/tr.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/locales/tr.yml diff --git a/config/locales/tr.yml b/config/locales/tr.yml new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/config/locales/tr.yml @@ -0,0 +1 @@ +{} From 3985c5e4c4e1e6c3dc28834a65fd6582cea321b8 Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 4 Feb 2021 21:55:24 +0000 Subject: [PATCH 327/767] Translated using Weblate (Russian) Currently translated at 89.0% (953 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/ --- config/locales/ru.yml | 294 +++++++++++++++++++++++++----------------- 1 file changed, 179 insertions(+), 115 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e2620ce3..944a9fed 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1,4 +1,3 @@ ---- ru: activerecord: attributes: @@ -14,7 +13,8 @@ ru: mobile_todos_per_page: Действий на страницу (мобильная версия) refresh: период обновления (в минутах) review_period: Период обзора проектов - show_completed_projects_in_sidebar: Отображать выполненные проекты в боковой панели + show_completed_projects_in_sidebar: Отображать выполненные проекты в боковой + панели show_hidden_contexts_in_sidebar: Отображать скрытые контексты в боковой панели show_hidden_projects_in_sidebar: Отображать скрытые проекты в боковой панели show_number_completed: Показывать количество выполненных действий @@ -26,6 +26,7 @@ ru: title_date_format: Формат даты в заголовке verbose_action_descriptors: Подробные описания действий week_starts: Неделя начинается с + theme: Тема project: default_context_name: Контекст по-умолчанию default_tags: Метки по-умолчанию @@ -43,12 +44,14 @@ ru: user: auth_type: Тип авторизации display_name: Отображаемое имя - email: Email address + email: Адрес электронной почты first_name: Имя last_name: Фамилия login: Пользователь open_id_url: Open ID идентификатор password: Пароль + last_login_at: Последний вход с + created_at: Создано в errors: full_messages: format: "%{attribute} %{message}" @@ -70,8 +73,9 @@ ru: odd: должно быть нечетным record_invalid: 'Проверка не пройдена: %{errors}' restrict_dependent_destroy: - many: Невозможно удалить запись, так как есть %{record} зависящие от нее one: Невозможно удалить запись, так как есть %{record} зависящая от нее + few: Невозможно удалить запись, так как есть %{record} зависящие от нее + many: '' taken: уже занято too_long: слишком длинное (максимум %{count} символов) too_short: слишком короткое (минимум %{count} символов) @@ -87,15 +91,15 @@ ru: body: 'Возникли проблемы при обработке полей:' header: one: 1 ошибка мешает сохранению %{model} - other: "%{count} ошибок мешают сохранению %{model}" + few: '%{count} ошибок мешают сохранению %{model}' + many: '' common: action: Действие actions: Действия actions_midsentence: - few: действия - one: действие - other: действий - zero: действий + one: действий + few: действие + many: действия add: Добавить ajaxError: От сервера была получена ошибка back: Назад @@ -107,10 +111,9 @@ ru: contribute: Сотрудничество create: Создать days_midsentence: - few: дня - one: день - other: дней - zero: дней + one: дней + few: день + many: дня deferred: отложенные description: Описание drag_handle: ТАЩИТЬ @@ -129,10 +132,9 @@ ru: none: Не задано not_available_abbr: н/д note: - few: "%{count} записи" - one: 1 запись - other: "%{count} записей" - zero: нет записей + one: нет записей + few: 1 запись + many: '%{count} записи' notes: Заметки numbered_step: Шаг %{number} ok: ОК @@ -148,11 +150,13 @@ ru: show_all: Показать все sort: alphabetically: По алфавиту - alphabetically_confirm: Вы уверены, что хотите сортировать проекты по алфавиту? Это изменит текущий порядок сортировки. + alphabetically_confirm: Вы уверены, что хотите сортировать проекты по алфавиту? + Это изменит текущий порядок сортировки. alphabetically_title: Сортировать проекты по алфавиту by_task_count: По количеству задач by_task_count_title: Сортировать по количеству задач - by_task_count_title_confirm: Вы уверены, что хотите сортировать проекты по количеству задач? Это изменит текущий порядок сортировки. + by_task_count_title_confirm: Вы уверены, что хотите сортировать проекты по количеству + задач? Это изменит текущий порядок сортировки. sort: Сортировать third: Третий todo: Задача @@ -170,7 +174,8 @@ ru: context_name: Имя контекста context_state: Состояние контекста delete_context: Удалить контекст - delete_context_confirmation: Вы уверены, что хотите удалить контекст '%{name}'? Это удалит также все действия (дублирующиеся) в этом контексте! + delete_context_confirmation: Вы уверены, что хотите удалить контекст '%{name}'? + Это удалит также все действия (дублирующиеся) в этом контексте! delete_context_title: Удалить контекст edit_context: Изменить контекст hidden_contexts: Скрытые контексты @@ -198,6 +203,15 @@ ru: import_errors: При импорте произошли ошибки import_successful: Импорт завершен. invalid_import_destination: Invalid import destination + import: + upload: Отправить + target_field: 'Импортировать в:' + successful: Импорт прошел успешно. + submit: Импорт + header: Импорт данных + errors: + file_blank: Файл не может быть пустым + some: Во время импорта возникли ошибки date: abbr_day_names: - Вс @@ -257,52 +271,50 @@ ru: datetime: distance_in_words: about_x_hours: - few: около %{count} часов one: около 1 часа - other: около %{count} часов + few: около %{count} часов + many: около %{count} часов about_x_months: - few: около %{count} месяцев one: около 1 месяца - other: около %{count} месяцев + few: около %{count} месяцев + many: около %{count} месяцев about_x_years: - few: около %{count} лет one: около 1 года - other: около %{count} лет + few: около %{count} лет + many: около %{count} лет almost_x_years: - few: почти %{count} года one: почти 1 год - other: почти %{count} лет + few: почти %{count} года + many: почти %{count} лет half_a_minute: пол минуты less_than_x_minutes: - few: меньше %{count} минут one: меньше минуты - other: меньше %{count} минут - zero: меньше минуты + few: меньше минуты + many: меньше %{count} минут less_than_x_seconds: - few: меньше %{count} секунд one: меньше 1 секунды - other: меньше %{count} секунд - zero: меньше 1 секунды + few: меньше 1 секунды + many: меньше %{count} секунд over_x_years: - few: более %{count} лет one: белее 1 года - other: более %{count} лет + few: более %{count} лет + many: более %{count} лет x_days: - few: "%{count} дня" one: 1 день - other: "%{count} дней" + few: '%{count} дня' + many: '%{count} дней' x_minutes: - few: "%{count} минуты" one: 1 минута - other: "%{count} минут" + few: '%{count} минуты' + many: '%{count} минут' x_months: - few: "%{count} месяца" one: 1 месяц - other: "%{count} месяцев" + few: '%{count} месяца' + many: '%{count} месяцев' x_seconds: - few: "%{count} секунды" one: 1 секунда - other: "%{count} секунд" + few: '%{count} секунды' + many: '%{count} секунд' prompts: day: День hour: Час @@ -335,7 +347,8 @@ ru: too_long: 'слишком длинное (максимум: %{count} символов)' too_short: 'слишком кроткое (минимум: %{count} символов)' wrong_length: неверной длины (должно быть %{count} символов) - user_unauthorized: '401 Неавторизован: Только Администраторы имеют доступ к этой функции.' + user_unauthorized: '401 Неавторизован: Только Администраторы имеют доступ к этой + функции.' feedlist: actions_completed_last_week: Действия завершенные за последние 7 дней actions_due_next_week: Действия за 7 дней или ранее @@ -348,14 +361,19 @@ ru: choose_context: Выберите контекст для ленты новостей choose_project: Выберите проект для ленты новостей context_centric_actions: Лента для незавершенных действий в определенном контексте - context_needed: Должен быть выбран хотя бы один контекст, чтобы можно было запросить ленту новостей + context_needed: Должен быть выбран хотя бы один контекст, чтобы можно было запросить + ленту новостей ical_feed: iCal-лента last_fixed_number: Последние %{number} действий legend: 'Легенда:' - notice_incomplete_only: 'Внимание: Все ленты отображают только действия, которые не помечены как выполеннные, и только незавершенные состояния. Данные iCal-ленты могут быть добавлены в список задач. Если вы хотите отображать сроки выполнения задач в календаре, используйте iCal-ленту на странице календаря.' + notice_incomplete_only: 'Внимание: Все ленты отображают только действия, которые + не помечены как выполеннные, и только незавершенные состояния. Данные iCal-ленты + могут быть добавлены в список задач. Если вы хотите отображать сроки выполнения + задач в календаре, используйте iCal-ленту на странице календаря.' plain_text_feed: Лента в текстовом формате project_centric: Лента для незавершенных действий в определенном проекте - project_needed: Должен быть выбран хотя бы один проект, чтобы можно было запросить ленту новостей + project_needed: Должен быть выбран хотя бы один проект, чтобы можно было запросить + ленту новостей projects_and_actions: Активные проекты и действия по ним rss_feed: RSS-лента select_feed_for_context: Выберите ленту новостей для этого контекста @@ -373,11 +391,14 @@ ru: opensearch_description: Искать в Tracks help: title: Help - usage: 'You can find information on the usage in the %{manual_link} in the project GitHub wiki.' + usage: 'You can find information on the usage in the %{manual_link} in the project + GitHub wiki.' manual_link_text: User manual - bugs: 'If you encounter a bug or have a feature request, please report it in the %{issue_link}.' + bugs: 'If you encounter a bug or have a feature request, please report it in the + %{issue_link}.' issue_link_text: issue queue - contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} for further information. You can also come discuss with the community:' + contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} + for further information. You can also come discuss with the community:' contribute_link_text: project website mailing_list_link_text: Mailing list irc_bullet: '%{irc_link} (also available in %{matrix_link})' @@ -459,7 +480,8 @@ ru: login_standard: вернуться к обычному входу login_with_openid: войти с помощью OpenID mobile_use_openid: "… или войдите при помощи OpenID" - openid_identity_url_not_found: Извините, пользователя с такой ссылкой URL не существует (%{identity_url}) + openid_identity_url_not_found: Извините, пользователя с такой ссылкой URL не существует + (%{identity_url}) option_separator: или, please_login: Пожалуйста авторизуйтесь, чтобы использовать Tracks session_time_out: Сессия истекла. Пожалуйста %{link} @@ -487,8 +509,10 @@ ru: todo: error_date_must_be_future: дата должна быть больше текущей user: - error_context_not_associated: Идентификатор контекста '%{context}' не соответствует идентификатору пользователя %{user}. - error_project_not_associated: Идентификатор проекта '%{project}' не соответствует идентификатору пользователя %{user}. + error_context_not_associated: Идентификатор контекста '%{context}' не соответствует + идентификатору пользователя %{user}. + error_project_not_associated: Идентификатор проекта '%{project}' не соответствует + идентификатору пользователя %{user}. notes: delete_confirmation: Уверены, что хотите удалить заметку '%{id}'? delete_item_title: Удалить элемент @@ -497,7 +521,8 @@ ru: deleted_note: Удалено '%{id}' edit_item_title: Редактировать элемент in_project: 'В:' - no_notes_available: 'На текущий момент заметок нет: добавьте заметки к проектам со страниц проектов.' + no_notes_available: 'На текущий момент заметок нет: добавьте заметки к проектам + со страниц проектов.' note_header: Заметка %{id} note_link_title: Показать заметку %{id} note_location_link: 'В:' @@ -508,17 +533,17 @@ ru: format: delimiter: "," format: "%u%n" - precision: 2 + precision: '2' separator: "." - significant: false - strip_insignificant_zeros: false + significant: 'False' + strip_insignificant_zeros: 'False' unit: "$" format: delimiter: "," - precision: 3 + precision: '3' separator: "." - significant: false - strip_insignificant_zeros: false + significant: 'False' + strip_insignificant_zeros: 'False' human: decimal_units: format: "%n %u" @@ -531,15 +556,16 @@ ru: unit: "." format: delimiter: '' - precision: 1 - significant: true - strip_insignificant_zeros: true + precision: '1' + significant: 'True' + strip_insignificant_zeros: 'True' storage_units: format: "%n %u" units: byte: one: байт - other: байт + few: байт + many: '' gb: Гб kb: Кб mb: Мб @@ -559,14 +585,17 @@ ru: current_authentication_type: Ваш тип авторизации %{auth_type} edit_preferences: Изменить настройки generate_new_token: Создать новый ключ - generate_new_token_confirm: Вы уверены? Создание нового ключа, заменит текущий и нарушит все внешние взаимодействия, которые использовали предыдущий ключ. + generate_new_token_confirm: Вы уверены? Создание нового ключа, заменит текущий + и нарушит все внешние взаимодействия, которые использовали предыдущий ключ. is_false: Нет is_true: Да open_id_url: Ваш OpenID URL page_title: TRACKS::Настройки page_title_edit: TRACKS::Редактирование настроек password_changed: Пароль изменен, пожалуйста войдите снова. - remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out. + remove_introduction: You can remove your user account here. Note that this is + irreversible and will remove all your data! After removal you will be logged + out. show_number_completed: Отображать %{number} выполненных элементов sms_context_none: Нет staleness_starts_after: Устаревание начинается после %{days} дней @@ -706,10 +735,12 @@ ru: action_selection_title: TRACKS::Действие выбор actions: Действия actions_30days_title: Действия за последние 30 дней - actions_actions_avg_created_30days: За последние 30 дней вы создали в среднем %{count} действий + actions_actions_avg_created_30days: За последние 30 дней вы создали в среднем + %{count} действий actions_avg_completed: и выполняли в среднем %{count} действий в месяц. actions_avg_completed_30days: выполнено в среднем %{count} действий в день. - actions_avg_completion_time: Все ваши выполненные действия, среднее время выполнения %{count} дней. + actions_avg_completion_time: Все ваши выполненные действия, среднее время выполнения + %{count} дней. actions_avg_created: За последние 12 месяцев вы создали в среднем %{count} действий actions_day_of_week_legend: day_of_week: День недели @@ -730,10 +761,13 @@ ru: actions_selected_from_week: Действия, выбранные из недели click_to_return: Нажмите %{link}, чтобы вернуться к странице статистики. click_to_return_link: здесь - click_to_show_actions_from_week: Кликните %{link}, чтобы отобразить действия из %{week} недели и далее. - click_to_update_actions: Нажмите на панель в диаграмме, чтобы обновить действия ниже. + click_to_show_actions_from_week: Кликните %{link}, чтобы отобразить действия из + %{week} недели и далее. + click_to_update_actions: Нажмите на панель в диаграмме, чтобы обновить действия + ниже. contexts: Контексты - current_running_time_of_incomplete_visible_actions: Текущее время работы над незавершенными видимыми действиями + current_running_time_of_incomplete_visible_actions: Текущее время работы над незавершенными + видимыми действиями index_title: TRACKS::Статистика labels: avg_completed: В среднем выполнено @@ -750,7 +784,8 @@ ru: number_of_days: Дней назад percentage: Процент running_time: Затрачено времени на задачу (недель) - more_stats_will_appear: Больше статистики появится здесь как только вы добавите действия. + more_stats_will_appear: Больше статистики появится здесь как только вы добавите + действия. no_actions_selected: Нет выбранных действий. no_tags_available: нет доступных меток open_per_week: Активные (видимые и скрытые) дальнейшие действия за неделю @@ -763,16 +798,22 @@ ru: running_time_all_legend: actions: Действия percentage: Процент - running_time: Время выполнения действия (недель). Нажмите на панель для более подробной информации. + running_time: Время выполнения действия (недель). Нажмите на панель для более + подробной информации. running_time_legend: actions: Действия percentage: Процент - weeks: Время выполнения действия (недель). Кликните на панель для дополнительной информации - spread_of_actions_for_all_context: Распределение выполняемых действий для все контекстов - spread_of_running_actions_for_visible_contexts: Распределение выполняемых действий для видимых контекстов - tag_cloud_90days_description: Это облако меток действия включает те, что были созданы или выполнены за последние 90 дней. + weeks: Время выполнения действия (недель). Кликните на панель для дополнительной + информации + spread_of_actions_for_all_context: Распределение выполняемых действий для все + контекстов + spread_of_running_actions_for_visible_contexts: Распределение выполняемых действий + для видимых контекстов + tag_cloud_90days_description: Это облако меток действия включает те, что были + созданы или выполнены за последние 90 дней. tag_cloud_90days_title: Облако меток для всех действий за последние 90 дней - tag_cloud_description: Это облако меток для включает метки всех действий (выполненных, невыполенных, видимых или скрытых) + tag_cloud_description: Это облако меток для включает метки всех действий (выполненных, + невыполенных, видимых или скрытых) tag_cloud_title: Облако меток для всех действий tags: Метки time_of_day: Время дня (все действия) @@ -787,7 +828,8 @@ ru: top10_projects: Топ 10 проектов top10_projects_30days: Топ 10 проектов за последние 30 дней top5_contexts: Топ 5 контекстов - top5_visible_contexts_with_incomplete_actions: Топ 5 видимых контекстов с незавершенными действиями + top5_visible_contexts_with_incomplete_actions: Топ 5 видимых контекстов с незавершенными + действиями totals: Итого totals_action_count: У вас всего %{count} действий totals_actions_completed: "%{count} из них выполнены." @@ -827,8 +869,10 @@ ru: action_deleted_error: Не удалось удалить действие action_deleted_success: Успешно удалено дальнейшее действие action_due_on: "(действие выполнить к %{date})" - action_marked_complete: Действие '%{description}' отмечено как %{completed} - action_marked_complete_error: Действие '%{description}' НЕ помечено как %{completed} из-за ошибки на сервере. + action_marked_complete: Действие '%{description}' отмечено как + %{completed} + action_marked_complete_error: Действие '%{description}' НЕ помечено + как %{completed} из-за ошибки на сервере. action_saved: Действие сохранено action_saved_to_tickler: Действие сохранено в Отложенные actions: @@ -866,19 +910,21 @@ ru: due_today: Выполнить сегодня get_in_ical_format: Получить календарь в формате iCal calendar_page_title: TRACKS::Календарь - cannot_add_dependency_to_completed_todo: Невозможно добавить действие как зависимость к выполненному действию! + cannot_add_dependency_to_completed_todo: Невозможно добавить действие как зависимость + к выполненному действию! clear_due_date: Очистить дату 'Выполнить к' clear_show_from_date: Очистить дату 'Показывать с' completed: Выполнено completed_actions: Completed actions completed_actions_with: Выполненные действия с меткой '%{tag_name}' completed_in_archive: - few: "%{count} выполненных действия в архиве." one: 1 выполненное действие в архиве. - other: "%{count} выполненных действий в архиве." + few: '%{count} выполненных действия в архиве.' + many: '%{count} выполненных действий в архиве.' completed_last_day: Выполнены за последние 24 часа completed_last_x_days: Выполнены за последние %{count} дней - completed_recurrence_completed: Нет дальнейших действий, которые следуют за удаленной регулярной задачей. Повторение остановлено + completed_recurrence_completed: Нет дальнейших действий, которые следуют за удаленной + регулярной задачей. Повторение остановлено completed_recurring: Выполненные регулярные задачи completed_recurring_actions_title: TRACKS::Completed recurring actions completed_rest_of_month: Выполнено за остаток месяца @@ -890,23 +936,26 @@ ru: confirm_delete: Уверены, что хотите удалить действие '%{description}'? context_changed: Контекст изменен на %{name} convert_to_project: Сформировать проект - defer_date_after_due_date: Дата отсрочки превышает дату выполнения. Измените дату выполнения, перед тем как отложить это действие. + defer_date_after_due_date: Дата отсрочки превышает дату выполнения. Измените дату + выполнения, перед тем как отложить это действие. defer_x_days: - few: Отложить на %{count} дня one: Отложить на 1 день - other: Отложить на %{count} дней + few: Отложить на %{count} дня + many: Отложить на %{count} дней deferred_actions_with: Отложенные действия с меткой '%{tag_name}' deferred_pending_actions: Отложенные/ожидающие действия deferred_tasks_title: TRACKS::Отложенные delete: Удалить delete_action: Удалить действие - delete_recurring_action_confirm: Уверены, что хотите удалить регулярную задачу '%{description}'? + delete_recurring_action_confirm: Уверены, что хотите удалить регулярную задачу + '%{description}'? delete_recurring_action_title: Удалить регулярную задачу deleted_success: Действие успешно удалено. depends_on: Зависит от depends_on_separate_with_commas: Зависит от (через запятую) done: Готово? - drag_action_title: Перетащите на другое действие, чтобы сделать его зависимым от него + drag_action_title: Перетащите на другое действие, чтобы сделать его зависимым + от него due: Выполнить к edit: Редактировать edit_action: Редактирвоать действие @@ -921,7 +970,8 @@ ru: error_removing_dependency: Ошибка при удалении зависимости error_saving_recurring: Ошибка при сохранении регулярной задачи '%{description}' error_starring: невозможно переключить отметку на задаче '%{description}' - error_starring_recurring: Невозможно установить/снять отметку регулярной задачи '%{description}' + error_starring_recurring: Невозможно установить/снять отметку регулярной задачи + '%{description}' error_toggle_complete: Невозможно отметить эту задачу как выполненную feed_title_in_context: в контексте '%{context}' feed_title_in_project: в проекте '%{project}' @@ -929,17 +979,19 @@ ru: completed: 'Выполено: %{date}' due: 'Выполнить к: %{date}' has_x_pending: - few: "%{count} ожидающих действия" one: Одно ожидающее действие - other: "%{count} ожидающих действий" + few: '%{count} ожидающих действия' + many: '%{count} ожидающих действий' hidden_actions: Скрытые действия in_hidden_state: в скрытом состоянии in_pending_state: в ожидании list_incomplete_next_actions: Выводит список незавершенных дальнейших действий - list_incomplete_next_actions_with_limit: Выводит список последних %{count} незавершенных дальнейших действий + list_incomplete_next_actions_with_limit: Выводит список последних %{count} незавершенных + дальнейших действий mark_complete: Отметить как выполненное mobile_todos_page_title: Все действия - new_related_todo_created: Добавлена новая задача, принадлежащая этой регулярной задаче + new_related_todo_created: Добавлена новая задача, принадлежащая этой регулярной + задаче new_related_todo_created_short: создана новая задача new_related_todo_not_created_short: не создана задача next_action_description: Описание дальнейшего действия @@ -1068,9 +1120,11 @@ ru: yearly_every_x_day: Каждый %{month} %{day} yearly_every_xth_day: "%{day} %{day_of_week} %{month}" yearly_options: Настройки ранних регулярных задач - recurrence_completed: Нет дальнейших действий, которые следуют за завершенной регулярной задачей. Повторение остановлено. + recurrence_completed: Нет дальнейших действий, которые следуют за завершенной + регулярной задачей. Повторение остановлено. recurrence_period: Период повторения - recurring_action_deleted: Задача удалена. Но создана новая, так как это регулярная задача + recurring_action_deleted: Задача удалена. Но создана новая, так как это регулярная + задача recurring_action_saved: Регулярная задача сохранена recurring_actions_title: TRACKS::Регулярные задачи recurring_deleted_success: Регулярная задача успешно удалена. @@ -1093,12 +1147,16 @@ ru: tags: Метки (через запятую) task_list_title: TRACKS::Список задач tickler_items_due: - few: "%{count} отложенных элемента подошли к дате выполнения - обновите страницу, чтобы увидеть изменения." - one: Отложенный элемент подошел к дате выполнения - обновите страницу, чтобы увидеть изменения. - other: "%{count} отложенных элементов подошли к дате выполнения - обновите страницу, чтобы увидеть изменения." + one: Отложенный элемент подошел к дате выполнения - обновите страницу, чтобы + увидеть изменения. + few: '%{count} отложенных элемента подошли к дате выполнения - обновите страницу, + чтобы увидеть изменения.' + many: '%{count} отложенных элементов подошли к дате выполнения - обновите страницу, + чтобы увидеть изменения.' to_tickler: в Отложенные unable_to_add_dependency: Не удается добавить зависимость - unresolved_dependency: Введенное значение зависимости не соответствует существующим действиям. Значние не будет сохранно, как и другие изменения. Продолжить? + unresolved_dependency: Введенное значение зависимости не соответствует существующим + действиям. Значние не будет сохранно, как и другие изменения. Продолжить? was_due_on_date: было запланировано к %{date} users: account_signup: регистрация пользователя @@ -1108,19 +1166,22 @@ ru: auth_type_updated: Тип авторизации обновлен. change_auth_type_title: TRACKS::Изменение типа авторизации change_authentication_type: Сменить тип авторизации - change_password_prompt: Введите новый пароль в поле ниже и нажмите 'Изменить пароль', чтобы заменить ваш старый пароль. + change_password_prompt: Введите новый пароль в поле ниже и нажмите 'Изменить пароль', + чтобы заменить ваш старый пароль. change_password_submit: Сменить пароль change_password_title: TRACKS::Изменение пароля choose_password: Выберите пароль confirm_password: Подтвердите пароль desired_login: Предполагаемое имя пользователя - destroy_confirmation: 'Предупреждение: это действие удалит пользователя ''%{login}'', все его действия, контексты, проекты и примечания. Продолжить?' + destroy_confirmation: 'Предупреждение: это действие удалит пользователя ''%{login}'', + все его действия, контексты, проекты и примечания. Продолжить?' destroy_error: Не удалось удалить пользователя %{login} destroy_successful: Пользователь %{login} удален destroy_user: Удалить пользователя - email_address: Email address + email_address: Адрес электронной почты failed_to_delete_user: Не удалось удалить пользователя %{username} - first_user_heading: 'Добро пожаловать в TRACKS. Для начала, создайте учетную запись Администратора:' + first_user_heading: 'Добро пожаловать в TRACKS. Для начала, создайте учетную запись + Администратора:' first_user_title: TRACKS::Войти как Администратор identity_url: URL идентификации label_auth_type: Тип авторизации @@ -1130,12 +1191,15 @@ ru: new_user_heading: 'Создайте нового пользователя:' new_user_title: TRACKS::Вход no_signups_title: TRACKS::Нет регистрации - openid_ok_pref_failed: Ваша ссылка %{url} подтверждена, но возникли проблемы при сохранении настроек авторизации. - openid_url_verified: Ваша ссылка %{url} подтверждена и установлена в качестве авторизации с OpenID. + openid_ok_pref_failed: Ваша ссылка %{url} подтверждена, но возникли проблемы при + сохранении настроек авторизации. + openid_url_verified: Ваша ссылка %{url} подтверждена и установлена в качестве + авторизации с OpenID. password_confirmation_label: Подтверждение пароля password_updated: пароль обновлен. register_with_cas: С вашим именем пользователя CAS - select_authentication_type: Выберите новый тип авторизации и нажмите 'Сменить тип авторизации', чтобы заменить текущие настройки. + select_authentication_type: Выберите новый тип авторизации и нажмите 'Сменить + тип авторизации', чтобы заменить текущие настройки. signup: Регистрация signup_new_user: Создать пользователя signup_successful: Вход пользователя %{username} выполнен. @@ -1154,12 +1218,12 @@ ru: multi_page: Отображено %{model} %{from} - %{to} из %{count} multi_page_html: Отображено %{model} %{from} - %{to} из %{count} single_page: - one: Отображен 1 %{model} - other: Отображены все %{count} %{model} - zero: "%{model} не найдено" + one: '%{model} не найдено' + few: Отображен 1 %{model} + many: Отображены все %{count} %{model} single_page_html: - one: Отображен 1 %{model} - other: Отображены все %{count} %{model} - zero: "%{model} не найдено" + one: '%{model} не найдено' + few: Отображен 1 %{model} + many: Отображены все %{count} %{model} page_gap: "…" previous_label: "← Пред" From c9d1991f7c18cac6e8c62cb867b43bb997d010f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=83=D0=BD=D0=BE=D0=B2?= Date: Fri, 12 Mar 2021 12:50:11 +0000 Subject: [PATCH 328/767] Translated using Weblate (Russian) Currently translated at 89.1% (954 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/ --- config/locales/ru.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 944a9fed..f5a0d8a7 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -76,6 +76,7 @@ ru: one: Невозможно удалить запись, так как есть %{record} зависящая от нее few: Невозможно удалить запись, так как есть %{record} зависящие от нее many: '' + has_one: Не удалось удалить запись, поскольку существует связанная %{record} taken: уже занято too_long: слишком длинное (максимум %{count} символов) too_short: слишком короткое (минимум %{count} символов) From 1feb0bc82a2903423392563ff1f5822b1477f3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=83=D0=BD=D0=BE=D0=B2?= Date: Fri, 19 Mar 2021 10:45:18 +0000 Subject: [PATCH 329/767] Translated using Weblate (Russian) Currently translated at 90.7% (971 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/ --- config/locales/ru.yml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f5a0d8a7..55b8c541 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -77,6 +77,7 @@ ru: few: Невозможно удалить запись, так как есть %{record} зависящие от нее many: '' has_one: Не удалось удалить запись, поскольку существует связанная %{record} + has_many: Не удалось удалить запись, поскольку от неё зависит %{record} taken: уже занято too_long: слишком длинное (максимум %{count} символов) too_short: слишком короткое (минимум %{count} символов) @@ -186,7 +187,7 @@ ru: letter_abbreviation: C new_context_post: "' будет также создан. Вы уверены?" new_context_pre: Новый контекст ' - no_contexts_: 'No contexts ' + no_contexts_: 'Нет контекста ' no_contexts_active: На текущий момент нет активных контекстов no_contexts_closed: На текущий момент нет закрытых контекстов no_contexts_hidden: На текущий момент нет скрытых контекстов @@ -213,6 +214,15 @@ ru: errors: file_blank: Файл не может быть пустым some: Во время импорта возникли ошибки + save_error: Не удаётся сохранить загруженный CSV (%{path_and_file}). У Tracks + нет доступа к каталогу загрузок? %{e} + invalid_csv: 'Недопустимый CSV: не удаётся прочитать заголовки: %{e}' + invalid_destination: 'Неверное место назначения импорта: %{e}' + yaml_disabled: Загрузка YAML отключена + todos_count: '%{count} задач импортировано' + projects_count: '%{count} проектов импортировано' + upload_csv: Загрузите пожалуйста ваш CSV файл + map_title: Отметьте поля для импорта date: abbr_day_names: - Вс @@ -326,15 +336,15 @@ ru: errors: format: "%{attribute} %{message}" messages: - accepted: должен быть подтвержден + accepted: должен быть подтверждён blank: должна быть заполнена confirmation: не соответствует %{attribute} empty: не может быть пустым - equal_to: должно равняться %{count} - even: должно быть четным - exclusion: зарезервированно + equal_to: должно быть равно %{count} + even: должно быть чётным + exclusion: зарезервировано greater_than: должно быть больше %{count} - greater_than_or_equal_to: должно быть больше или равно %{count} + greater_than_or_equal_to: должно быть больше либо равно %{count} inclusion: не входит в список invalid: неверное less_than: должно быть меньше %{count} @@ -345,8 +355,8 @@ ru: other_than: должно отличаться от %{count} present: должно быть пустым taken: уже занято - too_long: 'слишком длинное (максимум: %{count} символов)' - too_short: 'слишком кроткое (минимум: %{count} символов)' + too_long: 'слишком длинное (максимум %{count} символов)' + too_short: 'слишком короткое (минимум %{count} символов)' wrong_length: неверной длины (должно быть %{count} символов) user_unauthorized: '401 Неавторизован: Только Администраторы имеют доступ к этой функции.' @@ -383,7 +393,7 @@ ru: send_feedback: Обратная связь. Версия %{version} helpers: select: - prompt: Выберите + prompt: Выберите... submit: create: Создать %{model} submit: Сохранить %{model} From e06e5e3c4d41e329ab2bd39c1bf0b3a6dcf6d304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=83=D0=BD=D0=BE=D0=B2?= Date: Sat, 20 Mar 2021 23:01:08 +0000 Subject: [PATCH 330/767] Translated using Weblate (Russian) Currently translated at 100.0% (1070 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/ --- config/locales/ru.yml | 230 ++++++++++++++++++++++++++++++++---------- 1 file changed, 178 insertions(+), 52 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 55b8c541..2725f85b 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -93,8 +93,8 @@ ru: body: 'Возникли проблемы при обработке полей:' header: one: 1 ошибка мешает сохранению %{model} - few: '%{count} ошибок мешают сохранению %{model}' - many: '' + few: '%{count} ошибки мешают сохранению %{model}' + many: '%{count} ошибок мешают сохранению %{model}' common: action: Действие actions: Действия @@ -223,6 +223,38 @@ ru: projects_count: '%{count} проектов импортировано' upload_csv: Загрузите пожалуйста ваш CSV файл map_title: Отметьте поля для импорта + warning: Остерегайтесь + paste_field: 'Вставьте содержимое файла YAML, который вы экспортировали, в текстовое + поле ниже:' + yaml_warning: '%{warning}: все ваши текущие данные будут удалены перед импортом + файла YAML. Если у вас есть доступ к базе данных, мы настоятельно рекомендуем + прямо сейчас сделать резервную копию на случай, если что-то пойдёт не так.' + xml: XML + csv: CSV + yaml: YAML + export: + xml_link_title: Файл XML (только действия) + csv_notes_title: Файл CSV (только заметки) + csv_actions_title: Файл CSV (действия, контексты и проекты) + yaml_link_title: Файл YAML + download_link: Ссылка для загрузки + xml_link_description: Файл XML содержит все ваши действия, заметки, контексты, + проекты и метки + xml_description: '%{xml}: Лучше всего для импорта или конвертации данных' + csv_notes_description: Файл CSV содержит все ваши заметки + csv_actions_description: Файл CSV содержит все ваши действия в связи с контекстами + и проектами + csv_description: '%{csv}: Лучше всего для импорта в электронную таблицу или + программное обеспечение для анализа данных' + yaml_experimental: Пожалуйста помните о том, что импорт файла YAML в данный + момент поддерживается только в качестве эксперимента. Не полагайтесь на него + для резервного копирования критических данных. + yaml_link_description: Файл YAML содержит все ваши действия, заметки, контексты, + проекты и метки + yaml_description: '%{yaml}: Лучший вариант для экспорта.' + format_header: 'Вы можете выбрать из следующих форматов:' + title: Данные экспортируются + page_title: Tracks::Экспорт date: abbr_day_names: - Вс @@ -378,7 +410,7 @@ ru: last_fixed_number: Последние %{number} действий legend: 'Легенда:' notice_incomplete_only: 'Внимание: Все ленты отображают только действия, которые - не помечены как выполеннные, и только незавершенные состояния. Данные iCal-ленты + не помечены как выполенные, и только незавершенные состояния. Данные iCal-ленты могут быть добавлены в список задач. Если вы хотите отображать сроки выполнения задач в календаре, используйте iCal-ленту на странице календаря.' plain_text_feed: Лента в текстовом формате @@ -400,24 +432,115 @@ ru: update: Обновить %{model} integrations: opensearch_description: Искать в Tracks + mailgun: + instructions: + '3': Перейдите на %{preferences_link} и введите свой входящий адрес электронной + почты для Mailgun (такой как tracks@user.mailgun.com) в поле "%{sms_email_name}". + '6': "Обновите mailmap в 'site.yml' чтобы определить, какие отправители соответствуют\ + \ входящим адресам. Например, чтобы отправить письмо с вашей домашней и\ + \ рабочей почты в вашу связку Tracks Mailgun, установите что-то типа этого:\ + \ %{code}" + '5': Добавьте свой ключ Mailgun API (не Public API ключ) в файл Tracks 'site.yml' + '4': Выберите контекст по умолчанию для электронных писем и установите его + в поле "%{sms_context_name}" + 2b: "'Action' должно быть 'forward(\"http://mytracksserver.example.com/mailgun/mime\"\ + )'" + 2a: "'Filter expression' должен быть установлен как 'catch_all()'" + '2': "Перейдите на 'Routes' в панели управления Mailgun и добавьте новый маршрут:" + '1': Перейдите на %{mailgun_link} и зарегистрируйте бесплатную учётную запись. + gateway_instructions: Всё сказанное выше о формате писем применимо к работе + через Mailgun, т.к. данные обрабатываются тем же способом + conditions: Чтобы это работало, нужно чтобы ваш сервер Tracks был доступен из + интернета. Тогда Mailgun сможет отправлять на него данные. + description: Если вы хотите отправлять письма в Tracks, но не можете запустить + почтовый сервер на том же сервере, то можно использовать встроенную в Tracks + поддержку {mailgun_link}. + example_names: + tag: + '2': метка2 + '1': метка1 + project: проект + context: контекст + todo: моя прекрасная задача + email_rich: + field_descriptions: + star: Флаг запуска задачи + tag: Метки для задачи - могут использоваться повторно + due_date: Дата выполнения для задачи (может быть двузначной для дня, четырёхзначной + для месяца и дня или шестизначной для года, месяца и дня) + project: Проект для внесения в задачу + context: Контекст для внесения в задачу + fields_instruction: Все специальные символы являются необязательными, а текст + до первого символа (или конца строки) используется в качестве описания задачи + meaning_title: Значение + symbol_title: Символ + fields_title: 'Поля:' + description: 'Для обоих описанных методов используется следующий формат:' + message_gateway: + instructions: + '3': На вашу свежеустановленную почту отправлено письмо! + '2': В sendmail/qmail/postfix/другой почтовой программе, установите псевдоним + почтового адреса для конвейера сообщений в %{command} + '1': Перейдите на %{preferences_link}, установите ваши "%{sms_email_name}" + и "%{sms_context_name}" для отправки задач через электронную почту (которую + можно отправить с помощью сообщения SMS) + one_user_configuration: 'Вы также можете отправлять все письма определённому + пользователю Tracks. Установите mail_dispatch в site.yml как %{single_user_value} + и включайте имя пользователя в конвейер команд: %{code}' + configuration: Возможно вам понадобится установить ваш %{site_yml} чтобы сообщить + шлюзу использовать поле %{to_name} или %{from_name} для определения пользователя + Tracks по его адресу email. + rich_api_tip: Также вы можете использовать расширенный формат (Rich Todo API) + для отправки задач, например "постирать @ Дом" или "Позвонить Ивану > проект + X". Темой письма будет заполнено название задачи, её контекст и проект, а + тело письма будет вставлено в заметку. + description: 'Если Tracks запущен на том же сервере, что и ваш почтовый сервер, + вы можете использовать встроенную возможность интеграции с почтой. Следующие + шаги для настройки:' + feeds_link_text: ленты, предоставляемые Tracks + cron_email_subject: Задачи Tracks на следующие 7 дней + cron_2: Конечно вы можете использовать другой текст %{feeds_link} – почему бы + например не отправлять список следующих действий в конкретном проекте группе + коллег, которые над ним работают? + cron_1: Если вы вставите следующую строку в ваш crontab, то будете получать письма + каждый день около 5 часов утра со списком предстоящих дел, которые нужно выполнить + в течении следующих 7-ми дней. + tell_us_link_text: Сообщите об этом в нашей очереди задач + add_your_own: Можете добавить что-то своё? %{tell_us_link} и мы сможем включить + это в будущии версии Tracks. + contents_header: 'Содержимое:' + developer_documentation_link: документация разаработчика Tracks + intro: Tracks может быть интегрирован со многими другими инструментами... всем + что нужно для того чтобы помочь вам привести дела в порядок! На этой странице + есть информация о настройке некоторых из них. Не всё из этого применимо к различным + платформам, а что-то требует определённых технических знаний. Читайте также + %{documentation_link} + title: Интеграция + sections: + email_rich: Расширенный формат задач в письмах + mailgun: Отправлять почту в Tracks через Mailgun + message_gateway: Интеграция с почтовым сервером для возможности отправлять задачи + в Tracks по почте + automatic_email: Автоматически отправлять себе письма о предстоящих задачах help: title: Help - usage: 'You can find information on the usage in the %{manual_link} in the project - GitHub wiki.' + usage: 'Вы можете найти информацию об использовании %{manual_link} в GitHub wiki + проекта.' manual_link_text: User manual - bugs: 'If you encounter a bug or have a feature request, please report it in the - %{issue_link}.' - issue_link_text: issue queue - contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} - for further information. You can also come discuss with the community:' + bugs: 'Если вы столкнулись с ошибкой или предлагаете добавить новую функцию, обращайтесь + на %{issue_link}.' + issue_link_text: очередь задач + contribute: 'Мы категорически приветствуем любой вклад в развитие Tracks. Проверьте + %{contribute_link} для дополнительной информации. Вы также можете обсудить это + с сообществом:' contribute_link_text: project website mailing_list_link_text: Mailing list - irc_bullet: '%{irc_link} (also available in %{matrix_link})' - irc_link_text: 'IRC channel #Tracks@FreeNode' + irc_bullet: '%{irc_link} (также доснупно %{matrix_link})' + irc_link_text: 'Канал IRC #Tracks@FreeNode' matrix_link_text: Matrix layouts: mobile_navigation: - calendar: Calendar + calendar: Календарь contexts: Контекст feeds: Рассылка full: Полная версия @@ -499,7 +622,7 @@ ru: session_will_expire: сессия истекает после %{hours} часов отсутствия активности. session_will_not_expire: сессия не будет истекать. sign_in: Войти - signup_prompt: Want to create an account? + signup_prompt: Хотите создать учётную запись? successful: Вход успешен. С возвращением! successful_with_session_info: 'Вход выполнен:' unsuccessful: Неудачная попытка входа. @@ -513,7 +636,7 @@ ru: - Выполнить к _______ themes: black: Black - light_blue: Light blue + light_blue: Светло голубой project: feed_description: Список всех проектов %{username} feed_title: Проекты Tracks @@ -531,13 +654,13 @@ ru: delete_note_title: Удалить заметку '%{id}' deleted_note: Удалено '%{id}' edit_item_title: Редактировать элемент - in_project: 'В:' + in_project: 'В: ' no_notes_available: 'На текущий момент заметок нет: добавьте заметки к проектам со страниц проектов.' note_header: Заметка %{id} note_link_title: Показать заметку %{id} note_location_link: 'В:' - save_status_message: Note %{id} was saved + save_status_message: Заметка %{id} сохранена show_note_title: Показать заметку number: currency: @@ -561,7 +684,7 @@ ru: units: billion: Миллиард million: Миллион - quadrillion: Квадрильон + quadrillion: Квадриллион thousand: Тысяча trillion: Триллион unit: "." @@ -575,8 +698,8 @@ ru: units: byte: one: байт - few: байт - many: '' + few: байта + many: байт gb: Гб kb: Кб mb: Мб @@ -604,9 +727,9 @@ ru: page_title: TRACKS::Настройки page_title_edit: TRACKS::Редактирование настроек password_changed: Пароль изменен, пожалуйста войдите снова. - remove_introduction: You can remove your user account here. Note that this is - irreversible and will remove all your data! After removal you will be logged - out. + remove_introduction: Здесь вы можете удалить вашу учётную запись. Обратите внимание, + что это необратимо и удалит все ваши данные! После удаления вы окажетесь на + странице входа. show_number_completed: Отображать %{number} выполненных элементов sms_context_none: Нет staleness_starts_after: Устаревание начинается после %{days} дней @@ -614,12 +737,14 @@ ru: authentication: Авторизация date_and_time: Дата и время profile: Профиль - remove_account: Remove account + remove_account: Удалить учётную запись tracks_behavior: Поведение Tracks title: Ваши настройки token_description: Ключ (используется для лент новостей и API) token_header: Ваш ключ updated: Настройки изменены + pick_one: 'Или выберите одно из следующих действий:' + result_in: 'Это приведет к: ' projects: actions_in_project_title: Действия проекта active_projects: Активные проекты @@ -627,16 +752,16 @@ ru: add_note_submit: Добавить заметку add_project: Добавить проект all_completed_tasks_title: TRACKS::Список выполненных действий в проекте '%{project_name}' - completed_actions: Completed actions - completed_actions_empty: Completed actions empty + completed_actions: Завершённые задачи + completed_actions_empty: Нет завершённых задач completed_projects: Выполненные проекты completed_tasks_title: TRACKS::Список выполненных действий проекта '%{project_name}' default_context: Контекст по-умолчанию для этого проекта %{context} default_context_removed: Удален контекст по-умолчанию default_context_set: Установить для проекта контекст %{default_context} по-умолчанию default_tags_removed_notice: Метки по-умолчанию удалены - deferred_actions: Deferred actions - deferred_actions_empty: Deferred actions empty + deferred_actions: Отложенные действия + deferred_actions_empty: Нет отложенных действий delete_project: Удалить проект delete_project_confirmation: Уверены, что хотите удалить проект '%{name}'? delete_project_title: Удалить проект @@ -659,7 +784,7 @@ ru: notes: Заметки notes_empty: Нет заметок к этому проекту page_title: 'TRACKS::Проект: %{project}' - project_destroyed_status: Deleted project '%{name}' + project_destroyed_status: Удалённый проект '%{name}' project_saved_status: Проект сохранен project_state: Проект в состоянии %{state}. set_default_tags_notice: Установить метки %{default_tags} по-умолчанию для проекта @@ -729,7 +854,7 @@ ru: ":": ":" active: Активных проектов blocked: Заблокированные - closed: Closed projects + closed: Закрытые проекты completed: выполненные current: Текущие hidden: Скрытых проектов @@ -761,7 +886,7 @@ ru: day_of_week: День недели number_of_actions: Количество действий actions_dow_30days_title: Дни недели (за последние 30 дней) - actions_further: и далее + actions_further: ' и далее' actions_last_year: Действия за последние годы actions_last_year_legend: months_ago: Месяцев назад @@ -769,7 +894,7 @@ ru: actions_lastyear_title: Действия за последние 12 месяцев actions_min_completion_time: Минимальное время выполнения %{time}. actions_min_max_completion_days: Минимум/максимум дней до выполнения %{min}/%{max}. - actions_selected_from_week: Действия, выбранные из недели + actions_selected_from_week: 'Действия, выбранные из недели ' click_to_return: Нажмите %{link}, чтобы вернуться к странице статистики. click_to_return_link: здесь click_to_show_actions_from_week: Кликните %{link}, чтобы отобразить действия из @@ -809,7 +934,7 @@ ru: running_time_all_legend: actions: Действия percentage: Процент - running_time: Время выполнения действия (недель). Нажмите на панель для более + running_time: Время выполнения действия (в неделях). Нажмите на панель для более подробной информации. running_time_legend: actions: Действия @@ -860,9 +985,9 @@ ru: within_one: В пределах 1 support: array: - last_word_connector: ", и" - two_words_connector: и - words_connector: "," + last_word_connector: ", и " + two_words_connector: ' и ' + words_connector: ", " select: prompt: Выберите... time: @@ -926,7 +1051,7 @@ ru: clear_due_date: Очистить дату 'Выполнить к' clear_show_from_date: Очистить дату 'Показывать с' completed: Выполнено - completed_actions: Completed actions + completed_actions: Завершённые действия completed_actions_with: Выполненные действия с меткой '%{tag_name}' completed_in_archive: one: 1 выполненное действие в архиве. @@ -937,7 +1062,7 @@ ru: completed_recurrence_completed: Нет дальнейших действий, которые следуют за удаленной регулярной задачей. Повторение остановлено completed_recurring: Выполненные регулярные задачи - completed_recurring_actions_title: TRACKS::Completed recurring actions + completed_recurring_actions_title: TRACKS::Завершённые повторяющиеся действия completed_rest_of_month: Выполнено за остаток месяца completed_rest_of_previous_month: Выполнено в конце предыдущего месяца completed_rest_of_week: Выполнено за остаток недели @@ -966,7 +1091,7 @@ ru: depends_on_separate_with_commas: Зависит от (через запятую) done: Готово? drag_action_title: Перетащите на другое действие, чтобы сделать его зависимым - от него + от него. due: Выполнить к edit: Редактировать edit_action: Редактирвоать действие @@ -1048,14 +1173,14 @@ ru: no_actions_due_this_week: До конца недели нет действий no_actions_found_title: No actions found title no_actions_with: No actions with - no_completed_actions: No completed actions - no_completed_actions_with: No completed actions with - no_completed_recurring: No completed recurring - no_deferred_actions: No deferred actions - no_deferred_actions_with: No deferred actions with + no_completed_actions: Нет завершённых действий + no_completed_actions_with: Нет завершённых действий с + no_completed_recurring: Нет завершённых повторяющихся действий + no_deferred_actions: Нет отложенных действий + no_deferred_actions_with: Нет отложенных действий с no_last_completed_actions: Не найдено выполненных действий no_project: "--Нет проекта--" - no_recurring_todos: No recurring todos + no_recurring_todos: Нет повторяющихся задач notes: Notes overdue: Просроченные pending: Ожидание @@ -1081,7 +1206,7 @@ ru: - четверг - пятница - суббота - due: '' + due: 'срок исполнения' every_day: ежедневно every_month: ежемесячно every_n: каждый %{n} @@ -1119,7 +1244,7 @@ ru: recurrence_on: due_date: даты выполнения from_tickler: даты начала отображения задачи (но не для даты выполнения) - options: 'Вычислять дату для:' + options: 'Вычислять дату для' show_always: всегда show_days_before: за %{days} дней до даты выполнения show_options: Отображать действие @@ -1171,7 +1296,7 @@ ru: was_due_on_date: было запланировано к %{date} users: account_signup: регистрация пользователя - approve_tos: I approve the Terms of Service + approve_tos: Я принимаю Условия обслуживания auth_change_submit: Сменить тип авторизации auth_type_update_error: 'Не удалось обновить ваш тип авторизации: %{error_messages}' auth_type_updated: Тип авторизации обновлен. @@ -1215,7 +1340,7 @@ ru: signup_new_user: Создать пользователя signup_successful: Вход пользователя %{username} выполнен. successfully_deleted_user: Пользователь %{username} удален - tos_link: read the Terms of Service + tos_link: прочитайте Условия обслуживания total_actions: Всего действий total_contexts: Всего контекстов total_notes: Всего примечаний @@ -1223,17 +1348,18 @@ ru: total_users_count: Всего %{count} пользователей user_created: Пользователь создан. you_have_to_reset_your_password: Вы сбросили свой пароль + manage_users_title: TRACKS::Управление пользоветелями will_paginate: next_label: След → page_entries_info: multi_page: Отображено %{model} %{from} - %{to} из %{count} multi_page_html: Отображено %{model} %{from} - %{to} из %{count} single_page: - one: '%{model} не найдено' - few: Отображен 1 %{model} + one: '%{model} не найден' + few: Отображён 1 %{model} many: Отображены все %{count} %{model} single_page_html: - one: '%{model} не найдено' + one: '%{model} не найден' few: Отображен 1 %{model} many: Отображены все %{count} %{model} page_gap: "…" From 9b45ee9965cfb56919565550538d9dd56c4c422b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=83=D0=BD=D0=BE=D0=B2?= Date: Tue, 23 Mar 2021 13:41:21 +0000 Subject: [PATCH 331/767] Translated using Weblate (Russian) Currently translated at 100.0% (1070 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/ --- config/locales/ru.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 2725f85b..3d2c7b35 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -412,7 +412,7 @@ ru: notice_incomplete_only: 'Внимание: Все ленты отображают только действия, которые не помечены как выполенные, и только незавершенные состояния. Данные iCal-ленты могут быть добавлены в список задач. Если вы хотите отображать сроки выполнения - задач в календаре, используйте iCal-ленту на странице календаря.' + задач в календаре, используйте iCal-ленту на странице календаря' plain_text_feed: Лента в текстовом формате project_centric: Лента для незавершенных действий в определенном проекте project_needed: Должен быть выбран хотя бы один проект, чтобы можно было запросить @@ -935,7 +935,7 @@ ru: actions: Действия percentage: Процент running_time: Время выполнения действия (в неделях). Нажмите на панель для более - подробной информации. + подробной информации running_time_legend: actions: Действия percentage: Процент From 663506ba66d35b6373c777a072d7da6ef543a815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Engelbrektson?= Date: Thu, 13 May 2021 21:18:09 +0200 Subject: [PATCH 332/767] Added translation using Weblate (Swedish) --- config/locales/sv.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/locales/sv.yml diff --git a/config/locales/sv.yml b/config/locales/sv.yml new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/config/locales/sv.yml @@ -0,0 +1 @@ +{} From 33dfea08eda75f36cdc6349f7f6f69728b4bea72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A7=D1=82=D0=B0=D0=B1=D1=81?= Date: Sun, 20 Jun 2021 07:30:35 +0000 Subject: [PATCH 333/767] Translated using Weblate (Russian) Currently translated at 100.0% (1070 of 1070 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/ --- config/locales/ru.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 3d2c7b35..49c60157 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -536,7 +536,7 @@ ru: contribute_link_text: project website mailing_list_link_text: Mailing list irc_bullet: '%{irc_link} (также доснупно %{matrix_link})' - irc_link_text: 'Канал IRC #Tracks@FreeNode' + irc_link_text: 'IRC-канал #Tracks@Libera' matrix_link_text: Matrix layouts: mobile_navigation: From 1f625eab3552154286ea321a7262795868221010 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 9 Aug 2021 16:26:20 +0300 Subject: [PATCH 334/767] Fixed the plurals broken by Weblate (again) --- config/locales/de.yml | 33 ++++++++++++++++++++------------- config/locales/en.yml | 33 ++++++++++++++++++++------------- config/locales/fi.yml | 15 +++++++++------ 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 90e429bc..33026035 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -94,8 +94,9 @@ de: action: Aufgabe actions: Aufgaben actions_midsentence: - one: Aufgabe - other: Aufgaben + one: Aufgaben + other: Aufgabe + zero: Aufgabe add: Hinzufügen ajaxError: Fehler beim Empfangen vom Server back: Zurück @@ -107,8 +108,9 @@ de: contribute: Mitwirken create: Erstellen days_midsentence: - one: Tagen - other: Tag + one: Tag + other: Tagen + zero: Tagen deferred: aufgeschobene description: Beschreibung drag_handle: Verschieben @@ -127,8 +129,9 @@ de: none: Keine not_available_abbr: n/b note: - one: keine Notizen - other: 1 Notiz + one: 1 Notiz + other: "%{count} Notizen" + zero: keine Notizen notes: Notizen numbered_step: Schritt %{number} ok: Ok @@ -315,11 +318,13 @@ de: other: fast %{count} Jahre half_a_minute: eine halbe Minute less_than_x_minutes: - one: weniger als 1 Minute - other: weniger als eine Minute + one: weniger als eine Minute + other: weniger als %{count} Minuten + zero: weniger als 1 Minute less_than_x_seconds: one: weniger als 1 Sekunde - other: weniger als 1 Sekunde + other: weniger als %{count} Sekunden + zero: weniger als 1 Sekunde over_x_years: one: mehr als 1 Jahr other: mehr als %{count} Jahre @@ -1327,10 +1332,12 @@ de: multi_page_html: Angezeigte %{model} %{from} - %{to} von %{count} insgesamt single_page: - one: Kein %{model} gefunden - other: Angezeigte 1 %{model} + one: Angezeigte 1 %{model} + other: Anzeige aller %{count} %{model} + zero: Kein %{model} gefunden single_page_html: - one: Kein %{model} gefunden - other: Angezeigte 1 %{model} + one: Angezeigte 1 %{model} + other: Anzeige aller %{count} %{model} + zero: Kein %{model} gefunden page_gap: "..." previous_label: "« Zurück" diff --git a/config/locales/en.yml b/config/locales/en.yml index 023bfc74..0c5d4b4e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -95,8 +95,9 @@ en: action: Action actions: Actions actions_midsentence: - one: actions - other: action + one: action + other: actions + zero: actions add: Add ajaxError: There was an error retrieving from server back: Back @@ -108,8 +109,9 @@ en: contribute: Contribute create: Create days_midsentence: - one: days - other: day + one: day + other: days + zero: days deferred: deferred description: Description drag_handle: DRAG @@ -128,8 +130,9 @@ en: none: None not_available_abbr: n/a note: - one: no notes - other: 1 note + one: 1 notes + other: "%{count} notes" + zero: no notes notes: Notes numbered_step: Step %{number} ok: Ok @@ -316,11 +319,13 @@ en: other: almost %{count} years half_a_minute: half a minute less_than_x_minutes: - one: less than 1 minute - other: less than a minute + one: less than a minute + other: less than %{count} minutes + zero: less than 1 minute less_than_x_seconds: one: less than 1 second - other: less than 1 second + other: less than %{count} seconds + zero: less than 1 second over_x_years: one: over 1 year other: over %{count} years @@ -1319,10 +1324,12 @@ en: multi_page_html: Displaying %{model} %{from} - %{to} of %{count} in total single_page: - one: No %{model} found - other: Displaying 1 %{model} + one: Displaying 1 %{model} + other: Displaying all %{count} %{model} + zero: No %{model} found single_page_html: - one: No %{model} found - other: Displaying 1 %{model} + one: Displaying 1 %{model} + other: Displaying all %{count} %{model} + zero: No %{model} found page_gap: "…" previous_label: "← Previous" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index bab78b4a..24686aa0 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -130,8 +130,9 @@ fi: none: Ei not_available_abbr: ei note: - one: ei muistiinpanoja - other: 1 muistiinpano + one: 1 muistiinpano + other: "%{count} muistiinpanoa" + zero: ei muistiinpanoja notes: Muistiinpanot numbered_step: Askel %{number} ok: Ok @@ -1330,10 +1331,12 @@ fi: multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta single_page: - one: '%{model} ei löytynyt' - other: Näytetään 1 %{model} + one: Näytetään 1 %{model} + other: Näytetään kaikki %{count} %{model} + zero: '%{model} ei löytynyt' single_page_html: - one: '%{model} ei löytynyt' - other: Näytetään 1 %{model} + one: Näytetään 1 %{model} + other: Näytetään kaikki %{count} %{model} + zero: '%{model} ei löytynyt' page_gap: "…" previous_label: "← Edellinen" From 71ae8a2092db41216701c5cbd3f86a943afbed29 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 9 Aug 2021 16:37:49 +0300 Subject: [PATCH 335/767] A few clearly wrong plurals fixed in Russian. There may be some broken left, some were likely changed on purpose. --- config/locales/ru.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 49c60157..43681c8a 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -134,9 +134,10 @@ ru: none: Не задано not_available_abbr: н/д note: - one: нет записей - few: 1 запись - many: '%{count} записи' + few: "%{count} записи" + one: 1 запись + other: '%{count} записи' + zero: нет записей notes: Заметки numbered_step: Шаг %{number} ok: ОК @@ -1355,12 +1356,12 @@ ru: multi_page: Отображено %{model} %{from} - %{to} из %{count} multi_page_html: Отображено %{model} %{from} - %{to} из %{count} single_page: - one: '%{model} не найден' - few: Отображён 1 %{model} - many: Отображены все %{count} %{model} + one: Отображён 1 %{model} + other: Отображены все %{count} %{model} + zero: '%{model} не найден' single_page_html: - one: '%{model} не найден' - few: Отображен 1 %{model} - many: Отображены все %{count} %{model} + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} + zero: '%{model} не найден' page_gap: "…" previous_label: "← Пред" From 039bcf3880286c71241e2d0f7d7b231b3f6d7fe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 00:01:21 +0000 Subject: [PATCH 336/767] Bump solargraph from 0.40.4 to 0.43.0 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.40.4 to 0.43.0. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.40.4...v0.43.0) --- updated-dependencies: - dependency-name: solargraph dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 36f49dd2..2ff746e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM ast (2.4.2) autoprefixer-rails (10.1.0.0) execjs - backport (1.1.2) + backport (1.2.0) bcrypt (3.1.16) benchmark (0.1.1) bootstrap-sass (3.4.1) @@ -248,7 +248,7 @@ GEM rubocop-ast (>= 1.8.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.8.0) + rubocop-ast (1.9.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -270,10 +270,11 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.40.4) - backport (~> 1.1) + solargraph (0.43.0) + backport (~> 1.2) benchmark bundler (>= 1.17.2) + diff-lcs (~> 1.4) e2mmap jaro_winkler (~> 1.5) kramdown (~> 2.3) From 7c268bf09cb6d5ee5fd8534d9a8f61747ba09a45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 00:01:32 +0000 Subject: [PATCH 337/767] Bump tolk from 4.0.1 to 4.1.0 Bumps [tolk](https://github.com/tolk/tolk) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/tolk/tolk/releases) - [Changelog](https://github.com/tolk/tolk/blob/master/CHANGELOG.md) - [Commits](https://github.com/tolk/tolk/compare/v4.0.1...v4.1.0) --- updated-dependencies: - dependency-name: tolk dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 13131181..9288f0ab 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ group :development do gem 'spring' gem 'yard' - gem 'tolk', '~> 4.0.1' + gem 'tolk', '~> 4.1.0' gem 'bullet' gem 'rack-mini-profiler' diff --git a/Gemfile.lock b/Gemfile.lock index 36f49dd2..b3b727cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,11 +112,11 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - ffi (1.15.0) + ffi (1.15.3) font-awesome-sass (5.15.1) sassc (>= 1.11) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) highline (2.0.3) htmlentities (4.3.4) i18n (1.8.10) @@ -160,13 +160,13 @@ GEM mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.0.2) + mini_mime (1.1.0) mini_portile2 (2.6.1) minitest (5.14.4) minitest-stub-const (0.6) mocha (1.13.0) mysql2 (0.5.3) - nio4r (2.5.7) + nio4r (2.5.8) nokogiri (1.12.2) mini_portile2 (~> 2.6.1) racc (~> 1.4) @@ -303,7 +303,7 @@ GEM thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - tolk (4.0.1) + tolk (4.1.0) rails (>= 5.0) safe_yaml (>= 0.8.6) sassc @@ -313,7 +313,7 @@ GEM execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) uniform_notifier (1.14.1) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) @@ -364,7 +364,7 @@ DEPENDENCIES spring sqlite3 therubyracer - tolk (~> 4.0.1) + tolk (~> 4.1.0) uglifier (>= 1.3.0) will_paginate yard From 9542a6ba6ce89d7e636f3733b12700fa7f55c671 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 00:01:45 +0000 Subject: [PATCH 338/767] Bump puma from 5.3.2 to 5.4.0 Bumps [puma](https://github.com/puma/puma) from 5.3.2 to 5.4.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.3.2...v5.4.0) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 13131181..fdc99961 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'bcrypt', '~> 3.1.16' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' gem 'htmlentities' gem 'paperclip' -gem 'puma', '~> 5.3' +gem 'puma', '~> 5.4' gem 'rails_autolink' gem 'RedCloth' gem 'sanitize', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 36f49dd2..7163adb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,7 +166,7 @@ GEM minitest-stub-const (0.6) mocha (1.13.0) mysql2 (0.5.3) - nio4r (2.5.7) + nio4r (2.5.8) nokogiri (1.12.2) mini_portile2 (~> 2.6.1) racc (~> 1.4) @@ -182,7 +182,7 @@ GEM parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.3.2) + puma (5.4.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -349,7 +349,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 5.3) + puma (~> 5.4) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing From 90bf078a461f70be1b08ef4aeaaedef7f5162645 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 00:26:22 +0000 Subject: [PATCH 339/767] Bump listen from 3.5.1 to 3.6.0 Bumps [listen](https://github.com/guard/listen) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.5.1...v3.6.0) --- updated-dependencies: - dependency-name: listen dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 36f49dd2..8172d630 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM ast (2.4.2) autoprefixer-rails (10.1.0.0) execjs - backport (1.1.2) + backport (1.2.0) bcrypt (3.1.16) benchmark (0.1.1) bootstrap-sass (3.4.1) @@ -112,11 +112,11 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - ffi (1.15.0) + ffi (1.15.3) font-awesome-sass (5.15.1) sassc (>= 1.11) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) highline (2.0.3) htmlentities (4.3.4) i18n (1.8.10) @@ -143,7 +143,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) libv8 (3.16.14.19) - listen (3.5.1) + listen (3.6.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.11.0) @@ -160,13 +160,13 @@ GEM mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.0.2) + mini_mime (1.1.0) mini_portile2 (2.6.1) minitest (5.14.4) minitest-stub-const (0.6) mocha (1.13.0) mysql2 (0.5.3) - nio4r (2.5.7) + nio4r (2.5.8) nokogiri (1.12.2) mini_portile2 (~> 2.6.1) racc (~> 1.4) @@ -182,7 +182,7 @@ GEM parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.3.2) + puma (5.4.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -227,7 +227,7 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.0.0) rake (13.0.6) - rb-fsevent (0.10.4) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) @@ -248,7 +248,7 @@ GEM rubocop-ast (>= 1.8.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.8.0) + rubocop-ast (1.9.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -270,10 +270,11 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.40.4) - backport (~> 1.1) + solargraph (0.43.0) + backport (~> 1.2) benchmark bundler (>= 1.17.2) + diff-lcs (~> 1.4) e2mmap jaro_winkler (~> 1.5) kramdown (~> 2.3) @@ -303,7 +304,7 @@ GEM thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - tolk (4.0.1) + tolk (4.1.0) rails (>= 5.0) safe_yaml (>= 0.8.6) sassc @@ -313,7 +314,7 @@ GEM execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) uniform_notifier (1.14.1) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) @@ -349,7 +350,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 5.3) + puma (~> 5.4) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing @@ -364,7 +365,7 @@ DEPENDENCIES spring sqlite3 therubyracer - tolk (~> 4.0.1) + tolk (~> 4.1.0) uglifier (>= 1.3.0) will_paginate yard From 621d98d61ed3974e9cd3321d3d62184a37d106a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 00:27:35 +0000 Subject: [PATCH 340/767] Bump sanitize from 5.2.3 to 6.0.0 Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.3 to 6.0.0. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.3...v6.0.0) --- updated-dependencies: - dependency-name: sanitize dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 6 +++--- Gemfile.lock | 38 ++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 13131181..ae19dcb2 100644 --- a/Gemfile +++ b/Gemfile @@ -22,10 +22,10 @@ gem 'bcrypt', '~> 3.1.16' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' gem 'htmlentities' gem 'paperclip' -gem 'puma', '~> 5.3' +gem 'puma', '~> 5.4' gem 'rails_autolink' gem 'RedCloth' -gem 'sanitize', '~> 5.2' +gem 'sanitize', '~> 6.0' gem 'will_paginate' # See https://github.com/sstephenson/execjs#readme for more supported runtimes @@ -40,7 +40,7 @@ group :development do gem 'spring' gem 'yard' - gem 'tolk', '~> 4.0.1' + gem 'tolk', '~> 4.1.0' gem 'bullet' gem 'rack-mini-profiler' diff --git a/Gemfile.lock b/Gemfile.lock index 36f49dd2..b82f1e50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM ast (2.4.2) autoprefixer-rails (10.1.0.0) execjs - backport (1.1.2) + backport (1.2.0) bcrypt (3.1.16) benchmark (0.1.1) bootstrap-sass (3.4.1) @@ -112,11 +112,11 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - ffi (1.15.0) + ffi (1.15.3) font-awesome-sass (5.15.1) sassc (>= 1.11) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) highline (2.0.3) htmlentities (4.3.4) i18n (1.8.10) @@ -160,18 +160,16 @@ GEM mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.0.2) + mini_mime (1.1.0) mini_portile2 (2.6.1) minitest (5.14.4) minitest-stub-const (0.6) mocha (1.13.0) mysql2 (0.5.3) - nio4r (2.5.7) + nio4r (2.5.8) nokogiri (1.12.2) mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogumbo (2.0.4) - nokogiri (~> 1.8, >= 1.8.4) paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -182,7 +180,7 @@ GEM parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.3.2) + puma (5.4.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -248,14 +246,13 @@ GEM rubocop-ast (>= 1.8.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.8.0) + rubocop-ast (1.9.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) - sanitize (5.2.3) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -270,10 +267,11 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.40.4) - backport (~> 1.1) + solargraph (0.43.0) + backport (~> 1.2) benchmark bundler (>= 1.17.2) + diff-lcs (~> 1.4) e2mmap jaro_winkler (~> 1.5) kramdown (~> 2.3) @@ -303,7 +301,7 @@ GEM thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - tolk (4.0.1) + tolk (4.1.0) rails (>= 5.0) safe_yaml (>= 0.8.6) sassc @@ -313,7 +311,7 @@ GEM execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) uniform_notifier (1.14.1) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) @@ -349,7 +347,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 5.3) + puma (~> 5.4) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing @@ -357,14 +355,14 @@ DEPENDENCIES rails_autolink rspec-expectations rubocop (~> 1.18) - sanitize (~> 5.2) + sanitize (~> 6.0) sassc-rails (~> 2.1.2) simplecov solargraph spring sqlite3 therubyracer - tolk (~> 4.0.1) + tolk (~> 4.1.0) uglifier (>= 1.3.0) will_paginate yard From 72da20788b345bc8a9b4eb784f54bbecc360a363 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Aug 2021 00:01:58 +0000 Subject: [PATCH 341/767] Bump will_paginate from 3.3.0 to 3.3.1 Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/mislav/will_paginate/releases) - [Commits](https://github.com/mislav/will_paginate/compare/v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: will_paginate dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fabdb530..1c154767 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -314,7 +314,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - will_paginate (3.3.0) + will_paginate (3.3.1) yard (0.9.26) zeitwerk (2.4.2) From 401545bb15da750a8b0d32921889cf5e3c75088e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Aug 2021 00:02:19 +0000 Subject: [PATCH 342/767] Bump rubocop from 1.18.4 to 1.19.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.4 to 1.19.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.18.4...v1.19.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index ae19dcb2..ac92bf18 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.18', require: false + gem 'rubocop', '~> 1.19', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index fabdb530..81722ec8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,16 +237,16 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.18.4) + rubocop (1.19.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.8.0, < 2.0) + rubocop-ast (>= 1.9.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.9.0) + rubocop-ast (1.10.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -354,7 +354,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.18) + rubocop (~> 1.19) sanitize (~> 6.0) sassc-rails (~> 2.1.2) simplecov From 4321fba433702a9af61dad12a99ecac4815dfaab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Aug 2021 00:01:55 +0000 Subject: [PATCH 343/767] Bump bullet from 6.1.4 to 6.1.5 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.4 to 6.1.5. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.4...6.1.5) --- updated-dependencies: - dependency-name: bullet dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 426f12ca..cd5954f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - bullet (6.1.4) + bullet (6.1.5) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -310,7 +310,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) - uniform_notifier (1.14.1) + uniform_notifier (1.14.2) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) From 59f3f611863d4e7d47e276333fafec3317575461 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:01:56 +0000 Subject: [PATCH 344/767] Bump listen from 3.6.0 to 3.7.0 Bumps [listen](https://github.com/guard/listen) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: listen dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cd5954f0..037b2409 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) libv8 (3.16.14.19) - listen (3.6.0) + listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.11.0) From 76e97a9e7755f7159200dfe5c49c2dede883b4bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 00:02:06 +0000 Subject: [PATCH 345/767] Bump rubocop from 1.19.0 to 1.19.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.19.0...v1.19.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cd5954f0..e3d4f7d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,7 +237,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.19.0) + rubocop (1.19.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) From 6c0d3ca1b367c253cdc3ffa5703fcddeed753a6e Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 25 Aug 2021 17:15:34 +0300 Subject: [PATCH 346/767] Use the new fork gem --- Gemfile | 2 +- Gemfile.lock | 13 ++++--------- test/integration/project_xml_api_test.rb | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index ac92bf18..6ef10620 100644 --- a/Gemfile +++ b/Gemfile @@ -19,13 +19,13 @@ gem 'uglifier', '>=1.3.0' gem 'aasm', '~> 5.2.0' gem 'acts_as_list' gem 'bcrypt', '~> 3.1.16' -gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git' gem 'htmlentities' gem 'paperclip' gem 'puma', '~> 5.4' gem 'rails_autolink' gem 'RedCloth' gem 'sanitize', '~> 6.0' +gem 'tracks-chartjs-ror' gem 'will_paginate' # See https://github.com/sstephenson/execjs#readme for more supported runtimes diff --git a/Gemfile.lock b/Gemfile.lock index 1d4a973f..9376ebab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: git://github.com/ZeiP/chartjs-ror.git - revision: e9d3aabbda3059c001144833d915a386d8b511c5 - specs: - chartjs-ror (3.6.4) - rails (>= 3.1) - GEM remote: https://rubygems.org/ specs: @@ -305,6 +298,8 @@ GEM rails (>= 5.0) safe_yaml (>= 0.8.6) sassc + tracks-chartjs-ror (3.6.4) + rails (>= 3.1) tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) @@ -331,7 +326,6 @@ DEPENDENCIES bootstrap-sass (= 3.4.1) bullet byebug - chartjs-ror! codeclimate-test-reporter (= 1.0.7) coffee-rails (~> 5.0.0) database_cleaner @@ -363,9 +357,10 @@ DEPENDENCIES sqlite3 therubyracer tolk (~> 4.1.0) + tracks-chartjs-ror uglifier (>= 1.3.0) will_paginate yard BUNDLED WITH - 2.1.4 + 2.2.22 diff --git a/test/integration/project_xml_api_test.rb b/test/integration/project_xml_api_test.rb index f6dd305a..1412b864 100644 --- a/test/integration/project_xml_api_test.rb +++ b/test/integration/project_xml_api_test.rb @@ -3,7 +3,7 @@ require 'test_helper' class ProjectXmlApiTest < ActionDispatch::IntegrationTest @@project_name = "My New Project" @@valid_postdata = "#{@@project_name}" - + def test_retrieve_project authenticated_get_xml "/projects/1.xml", users(:admin_user).login, 'abracadabra', {} assert_select 'project' do @@ -20,37 +20,37 @@ class ProjectXmlApiTest < ActionDispatch::IntegrationTest # authenticated_post_xml_to_project_create "" # assert_equal 500, @integration_session.status end - + def test_fails_with_invalid_xml_format2 authenticated_post_xml_to_project_create "" assert_responses_with_error 'Name project must have a name' end - + def test_xml_simple_param_parsing authenticated_post_xml_to_project_create assert @controller.params.has_key?(:project) assert @controller.params[:project].has_key?(:name) assert_equal @@project_name, @controller.params[:project][:name] end - + def test_fails_with_401_if_not_authorized_user authenticated_post_xml_to_project_create @@valid_postdata, 'nobody', 'nohow' assert_response 401 end - + def test_fails_with_too_long_name invalid_with_long_name_postdata = "foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoo arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoo arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo barfoobarfoobarfoobarfoobarfoobarfoobar" authenticated_post_xml_to_project_create invalid_with_long_name_postdata assert_responses_with_error 'Name context name must be less than 256 characters' end - + def test_fails_with_comma_in_name authenticated_post_xml_to_project_create "foo,bar" assert_response :created project1 = Project.where(:name => "foo,bar").first assert_not_nil project1, "expected project 'foo,bar' to be created" end - + def test_creates_new_project assert_difference 'Project.count' do authenticated_post_xml_to_project_create @@ -59,9 +59,9 @@ class ProjectXmlApiTest < ActionDispatch::IntegrationTest project1 = Project.where(:name => @@project_name).first assert_not_nil project1, "expected project '#{@@project_name}' to be created" end - + private - + def authenticated_post_xml_to_project_create(postdata = @@valid_postdata, user = users(:other_user).login, password = 'sesame') authenticated_post_xml "/projects.xml", user, password, postdata end @@ -69,5 +69,5 @@ class ProjectXmlApiTest < ActionDispatch::IntegrationTest def assert_404_invalid_xml assert_response_and_body 404, "Expected post format is valid xml like so: project name." end - + end From b2684867036cc21605a25460392f8e861302db36 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 25 Aug 2021 19:26:21 +0300 Subject: [PATCH 347/767] Fix autocomplete accessibility content overflow --- app/assets/stylesheets/black.scss | 1 + app/assets/stylesheets/light_blue.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/app/assets/stylesheets/black.scss b/app/assets/stylesheets/black.scss index 25d59126..5956095c 100644 --- a/app/assets/stylesheets/black.scss +++ b/app/assets/stylesheets/black.scss @@ -2,6 +2,7 @@ * Apparently the requires need to be in the "root" stylesheet file, not * the imported manifest. * + *= require jquery-ui *= require jquery-ui/menu *= require jquery-ui/autocomplete *= require jquery-ui/datepicker diff --git a/app/assets/stylesheets/light_blue.scss b/app/assets/stylesheets/light_blue.scss index 8a9405e8..72e58d90 100644 --- a/app/assets/stylesheets/light_blue.scss +++ b/app/assets/stylesheets/light_blue.scss @@ -2,6 +2,7 @@ * Apparently the requires need to be in the "root" stylesheet file, not * the imported manifest. * + *= require jquery-ui *= require jquery-ui/menu *= require jquery-ui/autocomplete *= require jquery-ui/datepicker From 70cca807b7585eb8147ca1234dcca467ae4bcde0 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 25 Aug 2021 19:35:40 +0300 Subject: [PATCH 348/767] Add BUNDLE_WITHOUT to the installation document. Fixes #2297 --- doc/installation.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/installation.md b/doc/installation.md index 1b7b87b1..60cdfa21 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -81,16 +81,17 @@ Tracks container. In future there should be an official image in Docker Hub. You You can override database connection details by defining the environment variables in the run command, for example ”-e DATABASE_USERNAME=tracks_dev” or docker-compose.yml, if using Docker Compose. -|Name |Default |For PostgreSQL | -|------------------|-----------|---------------| -|DATABASE_NAME |tracks | | -|DATABASE_HOST |db | | -|DATABASE_PORT |3306 |5432 | -|DATABASE_USERNAME |tracks | | -|DATABASE_PASSWORD |password | | -|DATABASE_TYPE |mysql2 |postgresql | -|DATABASE_ENCODING |utf8 |unicode | -|RAILS_ENV |production | +|Name |Default |For PostgreSQL | +|------------------|-----------|--------------------| +|DATABASE_NAME |tracks | | +|DATABASE_HOST |db | | +|DATABASE_PORT |3306 |5432 | +|DATABASE_USERNAME |tracks | | +|DATABASE_PASSWORD |password | | +|DATABASE_TYPE |mysql2 |postgresql | +|DATABASE_ENCODING |utf8 |unicode | +|RAILS_ENV |production | | +|BUNDLE_WITHOUT | |Gem classes to omit | ### Override files From d9e20e6d1237e0ccd5ff9d9b3b37f530e38455de Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 25 Aug 2021 20:02:04 +0300 Subject: [PATCH 349/767] Remove the Rails dependency on host by fixing the bin/ra[ke,ils] scripts to use basic sh --- bin/rails | 19 ++++++++++++------- bin/rake | 20 +++++++++++++------- bin/run-rails | 5 +++++ bin/run-rake | 5 +++++ 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100755 bin/run-rails create mode 100755 bin/run-rake diff --git a/bin/rails b/bin/rails index e2afa025..cd471e11 100755 --- a/bin/rails +++ b/bin/rails @@ -1,8 +1,13 @@ -#!/usr/bin/env ruby -if File.exist?("#{__dir__}/../.use-docker") - exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env") -end +#!/bin/sh -APP_PATH = File.expand_path('../config/application', __dir__) -require_relative '../config/boot' -require 'rails/commands' +# Absolute path to this script, e.g. /home/user/bin/foo.sh +SCRIPT=$(readlink -f "$0") +# Absolute path this script is in, thus /home/user/bin +SCRIPTPATH=$(dirname "$SCRIPT") + +if [ -e ../.use-docker -a ! -e /etc/app-env ]; +then + $SCRIPTPATH/../script/docker-environment $0 "$@" +else + $SCRIPTPATH/run-rake "$@" +fi diff --git a/bin/rake b/bin/rake index c9e1ee4c..1dce1ede 100755 --- a/bin/rake +++ b/bin/rake @@ -1,7 +1,13 @@ -#!/usr/bin/env ruby -if File.exist?("#{__dir__}/../.use-docker") - exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env") -end -require_relative '../config/boot' -require 'rake' -Rake.application.run +#!/bin/sh + +# Absolute path to this script, e.g. /home/user/bin/foo.sh +SCRIPT=$(readlink -f "$0") +# Absolute path this script is in, thus /home/user/bin +SCRIPTPATH=$(dirname "$SCRIPT") + +if [ -e $SCRIPTPATH/../.use-docker -a ! -e /etc/app-env ]; +then + $SCRIPTPATH/../script/docker-environment $0 "$@" +else + $SCRIPTPATH/run-rake "$@" +fi diff --git a/bin/run-rails b/bin/run-rails new file mode 100755 index 00000000..b93066a1 --- /dev/null +++ b/bin/run-rails @@ -0,0 +1,5 @@ +#!/usr/bin/env ruby + +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/run-rake b/bin/run-rake new file mode 100755 index 00000000..8dbbadb1 --- /dev/null +++ b/bin/run-rake @@ -0,0 +1,5 @@ +#!/usr/bin/env ruby + +require_relative '../config/boot' +require 'rake' +Rake.application.run From 5a6ee73d7d2cebc9c712f646c8d2d49b8e2343c2 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 25 Aug 2021 21:15:18 +0300 Subject: [PATCH 350/767] Precompile datepicker i18n files for each language. Not an optimal solution, because it uses files from our own repository instead of the bundle, but found no other solution for now. --- app/assets/config/manifest.js | 8 ++++ .../javascripts-jquery-ui/datepicker-cs.js | 37 ++++++++++++++++++ .../javascripts-jquery-ui/datepicker-de.js | 37 ++++++++++++++++++ .../javascripts-jquery-ui/datepicker-es.js | 37 ++++++++++++++++++ .../javascripts-jquery-ui/datepicker-fi.js | 37 ++++++++++++++++++ .../javascripts-jquery-ui/datepicker-fr.js | 39 +++++++++++++++++++ .../javascripts-jquery-ui/datepicker-he.js | 37 ++++++++++++++++++ .../javascripts-jquery-ui/datepicker-nl.js | 37 ++++++++++++++++++ .../javascripts-jquery-ui/datepicker-ru.js | 37 ++++++++++++++++++ app/assets/javascripts/application.js | 8 ---- app/helpers/application_helper.rb | 8 ++-- 11 files changed, 310 insertions(+), 12 deletions(-) create mode 100644 app/assets/javascripts-jquery-ui/datepicker-cs.js create mode 100644 app/assets/javascripts-jquery-ui/datepicker-de.js create mode 100644 app/assets/javascripts-jquery-ui/datepicker-es.js create mode 100644 app/assets/javascripts-jquery-ui/datepicker-fi.js create mode 100644 app/assets/javascripts-jquery-ui/datepicker-fr.js create mode 100644 app/assets/javascripts-jquery-ui/datepicker-he.js create mode 100644 app/assets/javascripts-jquery-ui/datepicker-nl.js create mode 100644 app/assets/javascripts-jquery-ui/datepicker-ru.js diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index b16e53d6..cbc0e71e 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,3 +1,11 @@ //= link_tree ../images //= link_directory ../javascripts .js //= link_directory ../stylesheets .css +//= link datepicker-cs.js +//= link datepicker-de.js +//= link datepicker-es.js +//= link datepicker-fi.js +//= link datepicker-fr.js +//= link datepicker-he.js +//= link datepicker-nl.js +//= link datepicker-ru.js diff --git a/app/assets/javascripts-jquery-ui/datepicker-cs.js b/app/assets/javascripts-jquery-ui/datepicker-cs.js new file mode 100644 index 00000000..c2f79cf9 --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-cs.js @@ -0,0 +1,37 @@ +/* Czech initialisation for the jQuery UI date picker plugin. */ +/* Written by Tomas Muller (tomas@tomas-muller.net). */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.cs = { + closeText: "Zavřít", + prevText: "<Dříve", + nextText: "Později>", + currentText: "Nyní", + monthNames: [ "leden","únor","březen","duben","květen","červen", + "červenec","srpen","září","říjen","listopad","prosinec" ], + monthNamesShort: [ "led","úno","bře","dub","kvě","čer", + "čvc","srp","zář","říj","lis","pro" ], + dayNames: [ "neděle", "pondělí", "úterý", "středa", "čtvrtek", "pátek", "sobota" ], + dayNamesShort: [ "ne", "po", "út", "st", "čt", "pá", "so" ], + dayNamesMin: [ "ne","po","út","st","čt","pá","so" ], + weekHeader: "Týd", + dateFormat: "dd.mm.yy", + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.cs ); + +return datepicker.regional.cs; + +} ) ); diff --git a/app/assets/javascripts-jquery-ui/datepicker-de.js b/app/assets/javascripts-jquery-ui/datepicker-de.js new file mode 100644 index 00000000..a6779084 --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-de.js @@ -0,0 +1,37 @@ +/* German initialisation for the jQuery UI date picker plugin. */ +/* Written by Milian Wolff (mail@milianw.de). */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.de = { + closeText: "Schließen", + prevText: "<Zurück", + nextText: "Vor>", + currentText: "Heute", + monthNames: [ "Januar","Februar","März","April","Mai","Juni", + "Juli","August","September","Oktober","November","Dezember" ], + monthNamesShort: [ "Jan","Feb","Mär","Apr","Mai","Jun", + "Jul","Aug","Sep","Okt","Nov","Dez" ], + dayNames: [ "Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag" ], + dayNamesShort: [ "So","Mo","Di","Mi","Do","Fr","Sa" ], + dayNamesMin: [ "So","Mo","Di","Mi","Do","Fr","Sa" ], + weekHeader: "KW", + dateFormat: "dd.mm.yy", + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.de ); + +return datepicker.regional.de; + +} ) ); diff --git a/app/assets/javascripts-jquery-ui/datepicker-es.js b/app/assets/javascripts-jquery-ui/datepicker-es.js new file mode 100644 index 00000000..ea7116e0 --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-es.js @@ -0,0 +1,37 @@ +/* Inicialización en español para la extensión 'UI date picker' para jQuery. */ +/* Traducido por Vester (xvester@gmail.com). */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.es = { + closeText: "Cerrar", + prevText: "<Ant", + nextText: "Sig>", + currentText: "Hoy", + monthNames: [ "enero","febrero","marzo","abril","mayo","junio", + "julio","agosto","septiembre","octubre","noviembre","diciembre" ], + monthNamesShort: [ "ene","feb","mar","abr","may","jun", + "jul","ago","sep","oct","nov","dic" ], + dayNames: [ "domingo","lunes","martes","miércoles","jueves","viernes","sábado" ], + dayNamesShort: [ "dom","lun","mar","mié","jue","vie","sáb" ], + dayNamesMin: [ "D","L","M","X","J","V","S" ], + weekHeader: "Sm", + dateFormat: "dd/mm/yy", + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.es ); + +return datepicker.regional.es; + +} ) ); diff --git a/app/assets/javascripts-jquery-ui/datepicker-fi.js b/app/assets/javascripts-jquery-ui/datepicker-fi.js new file mode 100644 index 00000000..a8386ff6 --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-fi.js @@ -0,0 +1,37 @@ +/* Finnish initialisation for the jQuery UI date picker plugin. */ +/* Written by Harri Kilpiö (harrikilpio@gmail.com). */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.fi = { + closeText: "Sulje", + prevText: "«Edellinen", + nextText: "Seuraava»", + currentText: "Tänään", + monthNames: [ "Tammikuu","Helmikuu","Maaliskuu","Huhtikuu","Toukokuu","Kesäkuu", + "Heinäkuu","Elokuu","Syyskuu","Lokakuu","Marraskuu","Joulukuu" ], + monthNamesShort: [ "Tammi","Helmi","Maalis","Huhti","Touko","Kesä", + "Heinä","Elo","Syys","Loka","Marras","Joulu" ], + dayNamesShort: [ "Su","Ma","Ti","Ke","To","Pe","La" ], + dayNames: [ "Sunnuntai","Maanantai","Tiistai","Keskiviikko","Torstai","Perjantai","Lauantai" ], + dayNamesMin: [ "Su","Ma","Ti","Ke","To","Pe","La" ], + weekHeader: "Vk", + dateFormat: "d.m.yy", + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.fi ); + +return datepicker.regional.fi; + +} ) ); diff --git a/app/assets/javascripts-jquery-ui/datepicker-fr.js b/app/assets/javascripts-jquery-ui/datepicker-fr.js new file mode 100644 index 00000000..9e39fbd6 --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-fr.js @@ -0,0 +1,39 @@ +/* French initialisation for the jQuery UI date picker plugin. */ +/* Written by Keith Wood (kbwood{at}iinet.com.au), + Stéphane Nahmani (sholby@sholby.net), + Stéphane Raimbault */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.fr = { + closeText: "Fermer", + prevText: "Précédent", + nextText: "Suivant", + currentText: "Aujourd'hui", + monthNames: [ "janvier", "février", "mars", "avril", "mai", "juin", + "juillet", "août", "septembre", "octobre", "novembre", "décembre" ], + monthNamesShort: [ "janv.", "févr.", "mars", "avr.", "mai", "juin", + "juil.", "août", "sept.", "oct.", "nov.", "déc." ], + dayNames: [ "dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi" ], + dayNamesShort: [ "dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam." ], + dayNamesMin: [ "D","L","M","M","J","V","S" ], + weekHeader: "Sem.", + dateFormat: "dd/mm/yy", + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.fr ); + +return datepicker.regional.fr; + +} ) ); diff --git a/app/assets/javascripts-jquery-ui/datepicker-he.js b/app/assets/javascripts-jquery-ui/datepicker-he.js new file mode 100644 index 00000000..fb6238fd --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-he.js @@ -0,0 +1,37 @@ +/* Hebrew initialisation for the UI Datepicker extension. */ +/* Written by Amir Hardon (ahardon at gmail dot com). */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.he = { + closeText: "סגור", + prevText: "<הקודם", + nextText: "הבא>", + currentText: "היום", + monthNames: [ "ינואר","פברואר","מרץ","אפריל","מאי","יוני", + "יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר" ], + monthNamesShort: [ "ינו","פבר","מרץ","אפר","מאי","יוני", + "יולי","אוג","ספט","אוק","נוב","דצמ" ], + dayNames: [ "ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת" ], + dayNamesShort: [ "א'","ב'","ג'","ד'","ה'","ו'","שבת" ], + dayNamesMin: [ "א'","ב'","ג'","ד'","ה'","ו'","שבת" ], + weekHeader: "Wk", + dateFormat: "dd/mm/yy", + firstDay: 0, + isRTL: true, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.he ); + +return datepicker.regional.he; + +} ) ); diff --git a/app/assets/javascripts-jquery-ui/datepicker-nl.js b/app/assets/javascripts-jquery-ui/datepicker-nl.js new file mode 100644 index 00000000..7fcbff1a --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-nl.js @@ -0,0 +1,37 @@ +/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */ +/* Written by Mathias Bynens */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.nl = { + closeText: "Sluiten", + prevText: "←", + nextText: "→", + currentText: "Vandaag", + monthNames: [ "januari", "februari", "maart", "april", "mei", "juni", + "juli", "augustus", "september", "oktober", "november", "december" ], + monthNamesShort: [ "jan", "feb", "mrt", "apr", "mei", "jun", + "jul", "aug", "sep", "okt", "nov", "dec" ], + dayNames: [ "zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag" ], + dayNamesShort: [ "zon", "maa", "din", "woe", "don", "vri", "zat" ], + dayNamesMin: [ "zo", "ma", "di", "wo", "do", "vr", "za" ], + weekHeader: "Wk", + dateFormat: "dd-mm-yy", + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.nl ); + +return datepicker.regional.nl; + +} ) ); diff --git a/app/assets/javascripts-jquery-ui/datepicker-ru.js b/app/assets/javascripts-jquery-ui/datepicker-ru.js new file mode 100644 index 00000000..223e7764 --- /dev/null +++ b/app/assets/javascripts-jquery-ui/datepicker-ru.js @@ -0,0 +1,37 @@ +/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */ +/* Written by Andrew Stromnov (stromnov@gmail.com). */ +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "../widgets/datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}( function( datepicker ) { + +datepicker.regional.ru = { + closeText: "Закрыть", + prevText: "<Пред", + nextText: "След>", + currentText: "Сегодня", + monthNames: [ "Январь","Февраль","Март","Апрель","Май","Июнь", + "Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь" ], + monthNamesShort: [ "Янв","Фев","Мар","Апр","Май","Июн", + "Июл","Авг","Сен","Окт","Ноя","Дек" ], + dayNames: [ "воскресенье","понедельник","вторник","среда","четверг","пятница","суббота" ], + dayNamesShort: [ "вск","пнд","втр","срд","чтв","птн","сбт" ], + dayNamesMin: [ "Вс","Пн","Вт","Ср","Чт","Пт","Сб" ], + weekHeader: "Нед", + dateFormat: "dd.mm.yy", + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: "" }; +datepicker.setDefaults( datepicker.regional.ru ); + +return datepicker.regional.ru; + +} ) ); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7fd121ab..113fc78d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,14 +20,6 @@ //= require jquery-ui/widgets/droppable //= require jquery-ui/effects/effect-highlight //= require jquery-ui/widgets/sortable -//= require jquery-ui/i18n/datepicker-cs -//= require jquery-ui/i18n/datepicker-de -//= require jquery-ui/i18n/datepicker-es -//= require jquery-ui/i18n/datepicker-fi -//= require jquery-ui/i18n/datepicker-fr -//= require jquery-ui/i18n/datepicker-he -//= require jquery-ui/i18n/datepicker-nl -//= require jquery-ui/i18n/datepicker-ru // Stuff in app/assets //= require tracks diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5380a238..169f7163 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -168,11 +168,11 @@ module ApplicationHelper end def javascript_tag_for_i18n_datepicker -# locale = I18n.locale + locale = I18n.locale # do not include en as locale since this the available by default -# if locale && locale != :en -# javascript_include_tag("jquery-ui/i18n/datepicker-#{locale}") -# end + if locale && locale != :en + javascript_include_tag("datepicker-#{locale}") + end end def done_path(controller_name, type) From 406fdf233592f22fb81e14dd620631be39fffa97 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 26 Aug 2021 13:22:28 +0300 Subject: [PATCH 351/767] Fix a coding style error by CodeClimate --- app/helpers/application_helper.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 169f7163..0a93e66c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -170,9 +170,7 @@ module ApplicationHelper def javascript_tag_for_i18n_datepicker locale = I18n.locale # do not include en as locale since this the available by default - if locale && locale != :en - javascript_include_tag("datepicker-#{locale}") - end + javascript_include_tag("datepicker-#{locale}") if locale && locale != :en end def done_path(controller_name, type) From 16e26de2c5edd37113f13e46766f6e7ac84a17b2 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 26 Aug 2021 17:38:06 +0300 Subject: [PATCH 352/767] Remove the custom pluralisation rules in favor of rails_i18n and fix the RU language file a bit. --- config/initializers/i18n-config.rb | 37 ------------------------------ config/locales/ru.yml | 2 ++ 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 config/initializers/i18n-config.rb diff --git a/config/initializers/i18n-config.rb b/config/initializers/i18n-config.rb deleted file mode 100644 index a951eeac..00000000 --- a/config/initializers/i18n-config.rb +++ /dev/null @@ -1,37 +0,0 @@ -module I18n::Backend::Pluralization - # rules taken from : http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html - def pluralize(locale, entry, n) - return entry unless entry.is_a?(Hash) && n - if n == 0 && entry.has_key?(:zero) - key = :zero - else - key = case locale - when :pl # Polish - n==1 ? :one : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? :few : :other - when :cs, :sk # Czech, Slovak - n==1 ? :one : (n>=2 && n<=4) ? :few : :other - when :lt # Lithuanian - n%10==1 && n%100!=11 ? :one : n%10>=2 && (n%100<10 || n%100>=20) ? :few : :other - when :lv # Latvian - n%10==1 && n%100!=11 ? :one : n != 0 ? :few : :other - when :ru, :uk, :sr, :hr # Russian, Ukrainian, Serbian, Croatian - n%10==1 && n%100!=11 ? :one : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? :few : :other - when :sl # Slovenian - n%100==1 ? :one : n%100==2 ? :few : n%100==3 || n%100==4 ? :many : :other - when :ro # Romanian - n==1 ? :one : (n==0 || (n%100 > 0 && n%100 < 20)) ? :few : :other - when :gd # Gaeilge - n==1 ? :one : n==2 ? :two : :other; - # add another language if you like... - else - n==1 ? :one : :other # default :en - end - end - key = :other if key == :few && !entry.has_key?(key) #fallback to :other if :few is missing - raise InvalidPluralizationData.new(entry, n) unless entry.has_key?(key) - entry[key] - end -end - -I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization) -I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 43681c8a..ba9a53b1 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -102,6 +102,7 @@ ru: one: действий few: действие many: действия + other: действия add: Добавить ajaxError: От сервера была получена ошибка back: Назад @@ -1079,6 +1080,7 @@ ru: one: Отложить на 1 день few: Отложить на %{count} дня many: Отложить на %{count} дней + other: Отложить на %{count} дней deferred_actions_with: Отложенные действия с меткой '%{tag_name}' deferred_pending_actions: Отложенные/ожидающие действия deferred_tasks_title: TRACKS::Отложенные From bd085b7db9a3677c83d8d2b448ad0c559e69658a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Aug 2021 00:02:27 +0000 Subject: [PATCH 353/767] Bump rubocop from 1.19.1 to 1.20.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.19.1 to 1.20.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.19.1...v1.20.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6ef10620..bdbf040d 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.19', require: false + gem 'rubocop', '~> 1.20', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 9376ebab..83ef7647 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,7 +230,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.19.1) + rubocop (1.20.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -239,7 +239,7 @@ GEM rubocop-ast (>= 1.9.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.10.0) + rubocop-ast (1.11.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -348,7 +348,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.19) + rubocop (~> 1.20) sanitize (~> 6.0) sassc-rails (~> 2.1.2) simplecov From fa9d517e594965a928acc40375f2660852a6704f Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 31 Aug 2021 00:22:47 +0300 Subject: [PATCH 354/767] Parse the session expiry time to a Time instead of DateTime to allow comparison. --- app/controllers/login_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index af5a9232..2a1c55d0 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -80,6 +80,6 @@ class LoginController < ApplicationController def expiry_time return Time.zone.now + 10 unless session['expiry_time'] - DateTime.strptime(session['expiry_time'], "%FT%T.%L%Z") + Time.zone.parse(session['expiry_time']) end end From a4a6f50ad57f44de3c55449cd64cc478d1a196cd Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 31 Aug 2021 01:06:42 +0300 Subject: [PATCH 355/767] Make REST help translatable; fix a few missing translations --- app/views/integrations/rest_api.html.erb | 124 +++++++++++++---------- app/views/users/index.html.erb | 2 +- config/locales/en.yml | 55 ++++++++++ config/locales/fi.yml | 3 + 4 files changed, 129 insertions(+), 55 deletions(-) diff --git a/app/views/integrations/rest_api.html.erb b/app/views/integrations/rest_api.html.erb index e123b00e..abf9a758 100644 --- a/app/views/integrations/rest_api.html.erb +++ b/app/views/integrations/rest_api.html.erb @@ -1,22 +1,19 @@ -

    REST API Documentation for Developers

    +

    <%= t('rest_help.title') %>

    -

    Introduction

    +

    <%= t('rest_help.intro.title') %>

    -

    Tracks is designed to be integrated with scripts, web services, and third-party applications. This page serves as the documentation of our REST API.

    +

    <%= t('rest_help.intro.content') %>

    +

    <%= t('rest_help.intro.content_2') %>

    -

    Tracks REST API

    +

    <%= raw I18n.t 'rest_help.intro.content_3', restful_link: link_to(I18n.t('rest_help.intro.restful_link_text'), 'http://en.wikipedia.org/wiki/REST') %>

    -

    The Tracks REST API allows developers to integrate Tracks into their applications. It allows applications to access and modify Tracks data, and is implemented as Vanilla XML over HTTP.

    +

    <%= t('rest_help.auth.title') %>

    -

    The API is a RESTful service. All data is available through the API as a resource to which can be referred using a unique identifier. It responds to a number of the HTTP methods, specifically GET, PUT, POST and UPDATE, and all responses from the API are in a simple XML format encoded as UTF-8.

    +

    <%= raw I18n.t 'rest_help.auth.content', auth_link: link_to(I18n.t('rest_help.auth.basic_auth_link_text'), 'http://en.wikipedia.org/wiki/Basic_authentication') %>

    -

    Authentication

    +

    <%= t('rest_help.retrieve.title') %>

    -

    Authentication is handled using Basic HTTP authentication. Your Tracks username and password is used as the authentication credentials for the API. Note that in Basic HTTP authentication, your password is sent in clear text. If you need a more secure authentication solution, you should configure your web server to run Tracks under HTTPS.

    - -

    Retrieving data from the API

    - -

    To retrieve data you only need to do an HTTP GET on a resource identifier. For example, if you want to get all the contexts with cURL:

    +

    <%= raw I18n.t 'rest_help.retrieve.content', curl_link: link_to(I18n.t('rest_help.curl_link_text'), 'http://en.wikipedia.org/wiki/CURL') %>

     
@@ -27,7 +24,7 @@
    -

    Getting a single context:

    +

    <%= t('rest_help.retrieve.single_context') %>

     
@@ -38,7 +35,7 @@
    -

    Getting the todos within a context:

    +

    <%= t('rest_help.retrieve.todos_from_context') %>

     
@@ -49,28 +46,28 @@
    -

    You also can apply the pattern shown above with projects instead of contexts.

    - -

    All data is available according to the following resource paths:

    +

    <%= t('rest_help.retrieve.projects') %>

    +

    <%= t('rest_help.retrieve.paths_title') %>

    • /todos.xml
    • /todos/done.xml
      • -
    • /todos/ID.xml
      • +
    • /todos/<%= t('rest_help.id') %>.xml
    • /tickler.xml
    • /hidden.xml
    • /calendar.xml
    • /contexts.xml
      • -
    • /contexts/ID.xml
      • -
    • /contexts/ID/todos.xml
      • +
    • /contexts/<%= t('rest_help.id') %>.xml
      • +
    • /contexts/<%= t('rest_help.id') %>/todos.xml
    • /projects.xml
      • -
    • /projects/ID.xml
      • -
    • /projects/ID/todos.xml
      • +
    • /projects/<%= t('rest_help.id') %>.xml
      • +
    • /projects/<%= t('rest_help.id') %>/todos.xml
    -

    For the todo resources (todos, tickler, done, hidden and calendar) you can limit the returned -field to ID, created_at, modified_at, completed_at by adding the parameter -limit_fields and setting it to index. For example:

    +

    <%= raw t('rest_help.retrieve.limit', { + fields: 'ID, created_at, modified_at, completed_at', + limit_parameter: 'limit_fields', + set_to: 'index'}) %>

     
@@ -79,7 +76,7 @@ field to ID, created_at, modified_at, completed_at by adding the pa
    -If you only want to get the active todos, you add the parameter limit_to_active_todos and set it to some value like this: +

    <%= raw t('rest_help.retrieve.active_todos', active_code: 'limit_to_active_todos') %>

     
@@ -88,16 +85,19 @@ If you only want to get the active todos, you add the parameter limit_to_a
    -

    Writing to the API

    +

    <%= t('rest_help.writing.title') %>

    -

    The API provides mechanisms for adding, updating and deleting resources using the HTTP methods PUT, POST and DELETE in combination with the content.

    +

    <%= raw t('rest_help.writing.description', { + put: 'PUT', + post: 'POST', + delete: 'DELETE'}) %>

    -

    Creating a new project, using curl:

    +

    <%= t('rest_help.writing.example_title') %>

     
 $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \
-    -d "<project><name>Build a treehouse for the kids</name></project>" \
+    -d "<project><name><%= t('rest_help.writing.example_project_name') %></name></project>" \
     <%= root_url %>projects.xml -i
 >> HTTP/1.1 201 Created
 Location: <%= root_url %>projects/65.xml
@@ -105,12 +105,14 @@ Location: <%= root_url %>projects/65.xml
    -

    The response is an HTTP/1.1 201 Created with Location header indicating where the new project resource can be found. Now we can add a todo to this project, using curl:

    +

    <%= raw t('rest_help.writing.example_project_response_title', { + response_code: 'HTTP/1.1 201 Created', + header: 'Location'}) %>

     
 $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \
-    -d "<todo><description>Model treehouse in SketchUp</description><context_id>2</context_id><project_id>65</project_id></todo>" \
+    -d "<todo><description><%= t('rest_help.writing.example_todo_name') %></description><context_id>2</context_id><project_id>65</project_id></todo>" \
     <%= root_url %>todos.xml -i
 >> HTTP/1.1 201 Created
 Location: <%= root_url %>todos/452.xml
@@ -118,12 +120,14 @@ Location: <%= root_url %>todos/452.xml
    -

    The response is a again an HTTP/1.1 201 Created with Location header indicating where the new todo resource can be found. Changing the todo notes, again using curl:

    +

    <%= raw t('rest_help.writing.example_todo_response_title', { + response_code: 'HTTP/1.1 201 Created', + header: 'Location'}) %>

     
   $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" -X PUT \
-      -d "<todo><notes>use maple texture</notes></todos>" \
+      -d "<todo><notes><%= t('rest_help.writing.example_note_text') %></notes></todos>" \
       <%= root_url %>todos/452.xml -i
   >> HTTP/1.1 200 OK
   ...
@@ -131,15 +135,16 @@ Location: <%= root_url %>todos/452.xml
   <?xml version="1.0" encoding="UTF-8"?>
   <todo>
     ...
-    <description>Model treehouse in SketchUp</description>
+    <description><%= t('rest_help.writing.example_todo_name') %></description>
 
-    <notes>use maple texture</notes>
+    <notes><%= t('rest_help.writing.example_note_text') %></notes>
     ...
   </todo>
    -

    The response is an HTTP/1.1 200 OK with in the body the XML representation of the updated todo. We provide a shorcut method to toggle a todo done or undone without having to perform the update with the right field values:

    +

    <%= raw t('rest_help.writing.example_note_response_title', { + response_code: 'HTTP/1.1 200 OK'}) %>

     
@@ -159,8 +164,8 @@ Location: <%= root_url %>todos/452.xml
    - -

    If we want to delete that todo we can call its unique resource identifier (the URL) with the HTTP method DELETE, again with curl:

    +

    <%= raw t('rest_help.writing.example_delete_title', { + delete: 'DELETE'}) %>

     
@@ -171,15 +176,17 @@ Location: <%= root_url %>todos/452.xml
    -

    The API returns an HTTP/1.1 200 OK and the todo is now deleted.

    +

    <%= raw t('rest_help.writing.example_delete_response_title', { + response_code: 'HTTP/1.1 200 OK'}) %>

    +

    <%= t('rest_help.response.title') %>

    -

    Dealing with the response and response status

    +

    <%= raw t('rest_help.response.description', { + response_200: '200 OK', + response_201: '201 Created', + example_call: 'GET /contexts/2/todos.xml'}) %>

    - -

    All successful operations respond with a status code of 200 OK or 201 Created depending on the operation. Sometimes a list, say GET /contexts/2/todos.xml will not have any items, it will return an empty list.

    - -

    The XML for empty list responses look like this, again with curl:

    +

    <%= t('rest_help.response.xml_description') %>

     
@@ -191,9 +198,13 @@ $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \
    -

    Consuming the API with ActiveResource

    +

    <%= t('rest_help.activeresource.title') %>

    -

    ActiveResource is a thin but powerful wrapper around RESTful services exposed by Ruby on Rails. It will be part of Rails 2.0 but until then you can get it with gem install activeresource --source http://gems.rubyonrails.org --include-dependencies.

    +

    <%= raw I18n.t 'rest_help.activeresource.description', { + activeresource_link: link_to(I18n.t('rest_help.activeresource.activeresource_link_text'), 'http://weblog.rubyonrails.org/2007/9/30/rails-2-0-0-preview-release'), + ror_link: link_to(I18n.t('rest_help.activeresource.ror_link_text'), 'http://www.rubyonrails.org'), + gem_command: 'gem install activeresource --source http://gems.rubyonrails.org --include-dependencies' +} %>

     
@@ -213,10 +224,10 @@ Loading development environment (Rails 1.2.4)
 >> >> Context.find :all
 => [#<Context:0x274cfc8 @prefix_options={}, @attributes={...}, ...]
 
-
    -

    Inspired by 37 Signals ’s Highrise wrapper, we’ve put together a small ruby wrapper (find it in the doc/ directory) for the API which sets up the ActiveResource models for you to play with in an IRB session:

    +

    <%= raw I18n.t 'rest_help.activeresource.wrapper_description', { + signals_link: link_to(I18n.t('rest_help.activeresource.signals_link_text'), 'http://www.37signals.com')} %>

     
@@ -230,13 +241,18 @@ irb(main):003:0>
    -

    Notes about the documentation

    +

    <%= t('rest_help.notes.title') %>

    -

    A few conventions have been applied in the documentation, these are:

    +

    <%= t('rest_help.notes.description') %>

      -
    • ID’s in a resource URL indicate that the resource’s unique ID needs to be inserted there
      • -
    • ... indicates that unimportant bits of response data have been removed to eliminate noise from the documentation
      • +
    • <%= raw I18n.t 'rest_help.notes.bullet1', { + id: 'ID', + url: 'URL'} %>
      • +
    • <%= raw I18n.t 'rest_help.notes.bullet2', { + omit: '...' } %>
    -

    All examples make use of cURL .

    +

    <%= raw I18n.t 'rest_help.notes.curl_description', { + curl: link_to(I18n.t('rest_help.curl_link_text'), 'http://en.wikipedia.org/wiki/CURL')} %>

    + diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 9056c36b..819b4a16 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -22,7 +22,7 @@ <%= h user.login %> <%= h user.display_name %> <%= h user.email %> - <%= h user.auth_type %> + <%= t('auth_type.' + user.auth_type) %> <%= h user.open_id_url || '-' %> <%= h user.todos.size %> <%= h user.contexts.size %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 0c5d4b4e..47df204d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -9,6 +9,7 @@ en: due_style: Due style first_name: First name last_name: Last name + email: Email locale: Locale mobile_todos_per_page: Actions per page (Mobile View) refresh: Refresh interval (in minutes) @@ -1333,3 +1334,57 @@ en: zero: No %{model} found page_gap: "…" previous_label: "← Previous" + auth_type: + database: Database + rest_help: + title: REST API Documentation for Developers + id: ID + curl_link_text: cURL + intro: + title: Introduction + content: Tracks is designed to be integrated with scripts, web services, and third-party applications. This page serves as the documentation of our REST API. + content_2: The Tracks REST API allows developers to integrate Tracks into their applications. It allows applications to access and modify Tracks data, and is implemented as Vanilla XML over HTTP. + content_3: The API is a %{restful_link} service. All data is available through the API as a resource to which can be referred using a unique identifier. It responds to a number of the HTTP methods, specifically GET, PUT, POST and UPDATE, and all responses from the API are in a simple XML format encoded as UTF-8. + restful_link_text: RESTful + auth: + title: Authentication + content: Authentication is handled using %{auth_link}. Your Tracks username and password is used as the authentication credentials for the API. Note that in Basic HTTP authentication, your password is sent in clear text. If you need a more secure authentication solution, you should configure your web server to run Tracks under HTTPS. + basic_auth_link_text: Basic HTTP authentication + retrieve: + title: Retrieving data from the API + content: 'To retrieve data you only need to do an HTTP GET on a resource identifier. For example, if you want to get all the contexts with %{curl_link}:' + single_context: 'Getting a single context:' + todos_from_context: 'Getting the todos within a context:' + projects: You also can apply the pattern shown above with projects instead of contexts. + paths_title: 'All data is available according to the following resource paths:' + limit: 'For the todo resources (todos, tickler, done, hidden and calendar) you can limit the returnedfield to %{fields} by adding the parameter %{limit_parameter} and setting it to %{set_to}. For example:' + active_todos: 'If you only want to get the active todos, you add the parameter %{active_code} and set it to some value like this:' + writing: + title: Writing to the API + description: The API provides mechanisms for adding, updating and deleting resources using the HTTP methods %{put}, %{post} and %{delete} in combination with the content. + example_title: 'Creating a new project, using curl:' + example_project_name: Build a treehouse for the kids + example_project_response_title: 'The response is an %{response_code} with %{header} header indicating where the new project resource can be found. Now we can add a todo to this project, using curl:' + example_todo_name: Model treehouse in SketchUp + example_todo_response_title: 'The response is a again an %{response_code} with %{header} header indicating where the new todo resource can be found. Changing the todo notes, again using curl:' + example_note_text: use maple texture + example_note_response_title: 'The response is an %{response_code} with in the body the XML representation of the updated todo. We provide a shorcut method to toggle a todo done or undone without having to perform the update with the right field values:' + example_delete_title: 'If we want to delete that todo we can call its unique resource identifier (the URL) with the HTTP method %{delete}, again with curl:' + example_delete_response_title: The API returns an %{response_code} and the todo is now deleted. + response: + title: Dealing with the response and response status + description: All successful operations respond with a status code of %{response_200} or %{response_201} depending on the operation. Sometimes a list, say %{example_call} will not have any items, it will return an empty list. + xml_description: 'The XML for empty list responses look like this, again with curl:' + activeresource: + title: Consuming the API with ActiveResource + description: '%{activeresource_link} is a thin but powerful wrapper around RESTful services exposed by %{ror_link}. It will be part of Rails 2.0 but until then you can get it with %{gem_command}.' + activeresource_link_text: ActiveResource + ror_link_text: Ruby on Rails + wrapper_description: 'Inspired by %{signals_link} ’s Highrise wrapper, we’ve put together a small ruby wrapper (find it in the doc/ directory) for the API which sets up the ActiveResource models for you to play with in an IRB session:' + signals_link_text: 37 Signals + notes: + title: Notes about the documentation + description: 'A few conventions have been applied in the documentation, these are:' + bullet1: '%{id}’s in a resource %{url} indicate that the resource’s unique ID needs to be inserted there' + bullet2: '%{omit} indicates that unimportant bits of response data have been removed to eliminate noise from the documentation' + curl_description: 'All examples make use of %{curl}.' diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 24686aa0..a64c5c92 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -9,6 +9,7 @@ fi: due_style: Määräpäivän esitystapa first_name: Etunimi last_name: Sukunimi + email: Sähköpostiosoite locale: Kieli mobile_todos_per_page: Toimenpidettä sivulla (mobiilisivustolla) refresh: Päivitystiheys (minuutteina) @@ -1340,3 +1341,5 @@ fi: zero: '%{model} ei löytynyt' page_gap: "…" previous_label: "← Edellinen" + auth_type: + database: Tietokanta From 7590bbb264a7cca854bd30b05748a1089410bb63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Aug 2021 00:02:29 +0000 Subject: [PATCH 356/767] Bump rack-mini-profiler from 2.3.2 to 2.3.3 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.2 to 2.3.3. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.2...v2.3.3) --- updated-dependencies: - dependency-name: rack-mini-profiler dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 83ef7647..04963e8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,7 +177,7 @@ GEM nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) - rack-mini-profiler (2.3.2) + rack-mini-profiler (2.3.3) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) From 7fad611256f0f21e9a8a1c4923ea169f76310d85 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Tue, 31 Aug 2021 10:02:52 +0300 Subject: [PATCH 357/767] =?UTF-8?q?Fix=20the=20bin/rails=20script=20to=20r?= =?UTF-8?q?un=20Rails=20=E2=80=93=20copy-paste=20error.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/rails | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/rails b/bin/rails index cd471e11..9d8f5bd1 100755 --- a/bin/rails +++ b/bin/rails @@ -9,5 +9,5 @@ if [ -e ../.use-docker -a ! -e /etc/app-env ]; then $SCRIPTPATH/../script/docker-environment $0 "$@" else - $SCRIPTPATH/run-rake "$@" + $SCRIPTPATH/run-rails "$@" fi From 9aae52f6482085814dffd8f269e6ae67c72149ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 00:01:59 +0000 Subject: [PATCH 358/767] Bump spring from 2.1.1 to 3.0.0 Bumps [spring](https://github.com/rails/spring) from 2.1.1 to 3.0.0. - [Release notes](https://github.com/rails/spring/releases) - [Changelog](https://github.com/rails/spring/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/spring/compare/v2.1.1...v3.0.0) --- updated-dependencies: - dependency-name: spring dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 04963e8a..9d171f16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - spring (2.1.1) + spring (3.0.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) From 21cff05326110d3442cac04bd907f6f010c72173 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Sep 2021 00:02:06 +0000 Subject: [PATCH 359/767] Bump rubocop from 1.20.0 to 1.21.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.20.0 to 1.21.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.20.0...v1.21.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index bdbf040d..40a523ef 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.20', require: false + gem 'rubocop', '~> 1.21', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 9d171f16..7ce44ebd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,7 +169,7 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - parallel (1.20.1) + parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) @@ -230,7 +230,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.20.0) + rubocop (1.21.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -348,7 +348,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.20) + rubocop (~> 1.21) sanitize (~> 6.0) sassc-rails (~> 2.1.2) simplecov From 94c7fcc09a633ce9dbff971388eecd87db4af28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20H=C3=BCseyin=20Ekseli?= Date: Tue, 14 Sep 2021 22:38:38 +0000 Subject: [PATCH 360/767] Translated using Weblate (Turkish) Currently translated at 17.0% (190 of 1116 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/tr/ --- config/locales/tr.yml | 206 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 1 deletion(-) diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 0967ef42..f2cb7447 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1 +1,205 @@ -{} +data: + import: + yaml_disabled: YAML yükleme kapalı + todos_count: İçeri aktarılacak Todos sayısı %{count} + projects_count: İçe aktarılacak proje sayısı %{count} + upload_csv: Lütfen CSV dosyanızı yükleyin + upload: Karşıya yükle + target_field: 'Şuraya içe aktar:' + successful: İçe aktarma başarılı. + map_title: Harita dosyaları içe aktarılabilir + header: Dosya içe aktarılıyor + submit: İçe aktar + errors: + invalid_destination: 'Geçersiz içe aktarma dizini: %{e}' + some: İçe aktarım esnasında hata meydana geldi + save_error: Kayıt yüklenemedi CSV (%{path_and_file}). Tracks yükleme dizinine + yazsın mı? %{e} + invalid_csv: 'Geçersiz CSV: headerler okunamadı: %{e}' + file_blank: Dosya boş olamaz +contexts: + visible_contexts: Görünür içerikler + view_link: '%{name} içeriğini görüntüle' + update_status_message: İçerik adı değiştirildi + todos_append: bu içerikte + status_hidden: İçerik gizli + status_active: İçerik etkin + show_form_title: Bir içerik ekle + show_form: Yeni bir içerik oluştur + save_status_message: İçerik kaydedildi + no_contexts_hidden: Şu anda gizli bir içerik bulunmuyor + no_contexts_closed: Şu anda kapalı bir içerik bulunmuyor + no_contexts_active: Şu anda etkin bir içerik bulunmuyor + no_contexts_: 'İçerik yok ' + new_context_pre: Yeni içerik ' + new_context_post: "' de oluşturulacaktır. Emin misiniz?" + letter_abbreviation: C + last_completed_in_context: (son%{number}) + hide_form_title: Yeni içerik biçimini gizle + hide_form: Biçimi gizle + hidden_contexts: Gizlenmiş içerikler + edit_context: İçeriği düzenle + delete_context_title: İçeriği sil + delete_context_confirmation: Şu içeriği silmek istediğinize emin misiniz? %{name}' + İçerikteki bütün (tekrarlanan) eylemler de silinecektir! + delete_context: İçeriği sil + context_state: İçerik durumu + context_name: İçerik adı + context_hide: Font sayfasında gizle? + context_deleted: Silinen içerik '%{name}' + completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan eylemler + all_completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan bütün eylemler + add_context: İçerik ekle +common: + wiki: Wiki + weeks: haftalar + week: hafta + website: İnternet sayfası + update: Güncelle + todo: todo + third: Üçüncü + sort: + sort: Sırala + by_task_count_title_confirm: Bu projeleri görev sayısına göre sıralamak istediğinize + emin misiniz? Bu işlem mevcut sıralamayı iptal edecektir. + by_task_count_title: Görev sayısına göre sırala + by_task_count: Görev sayısına göre + alphabetically_title: Projeleri alfabetik olarak sırala + alphabetically_confirm: Bu projeleri alfabetik olarak sıralamak istediğinize emin + misiniz? Bu işlem mevcut sıralamayı iptal edecektir. + alphabetically: Alfabetik sırayla + show_all: Hepsini göster + server_error: Sunucuda bir hata meydana geldi. + second: İkinci + search: Ara + review: Gözden geçir + recurring_todos: Tekrarlanan eylemler + projects: Projeler + project: Proje + previous: Önceki + optional: opsiyonel + ok: Tamam + numbered_step: Adım %{number} + notes: Notlar + not_available_abbr: n/a + none: Hiçbiri + next: Sıradaki + months: aylar + month: ay + mailing_list: E-posta listesi + logout: Çıkış + last: Son + go_back: Geri git + fourth: Dördüncü + forth: İleri + first: Birinci + errors_with_fields: 'Şu alanlarda sorunlarla karşılaşıldı:' + email: E-posta + drag_handle: SÜRÜKLE + description: Açıklama + deferred: ertelenmiş + create: Oluştur + contribute: Katkıda bulun + contexts: İçerikler + context: İçerik + collapse_expand: Daralt/genişlet + cancel: İptal + bugs: Hatalar + back: Geri + ajaxError: Sunucudan alınırken bir hatayla karşılaşıldı + add: Ekle + actions: Eylemler + action: Eylem +activerecord: + errors: + template: + header: + one: 1 hata şunun %{model} kaydını engelledi + other: '%{count} hataları şunların %{model} kayıtlarını engelledi' + body: 'Şu alanlarda sorunlar mevcuttur:' + models: + project: + attributes: + name: + too_long: proje adı 256 karakterden kısa olmalıdır + taken: zaten mevcut + blank: projenin bir adı olmalıdır + messages: + wrong_length: yanlış uzunlukta (should be %{count} characters) + too_short: çok kısa (minimum is %{count} characters) + too_long: çok uzun (maximum is %{count} characters) + taken: zaten alınmış + restrict_dependent_destroy: + has_many: Bu kayda bağlı bir dosya bulunduğu için kayıt silinemez %{record} + has_one: Bu kayda bağlı farklı bir dosya bulunduğu için kayıt silinemez %{record} + record_invalid: 'Doğrulama başarısız: %{errors}' + odd: tek sayı olmalıdır + not_a_number: rakam değildir + less_than_or_equal_to: şundan az veya denk olmalıdır %{count} + less_than: şundan az olmalıdır %{count} + invalid: geçersiz + inclusion: listeye dahil değildir + greater_than_or_equal_to: şuna denk veya büyük olmalıdır %{count} + greater_than: şundan büyük olmalıdır %{count} + exclusion: alınmıştır + even: eşit olmalıdır + equal_to: şuna eşdeğer olmalıdır %{count} + empty: boş bırakılamaz + confirmation: eşleşmiyor + blank: boş bırakılamaz + accepted: Kabul edilmelidir + full_messages: + format: '%{attribute} %{message}' + attributes: + user: + password: Şifre + open_id_url: OpenID URL + login: Giriş + last_name: Soyad + last_login_at: Son giriş tarihi + first_name: İlk ad + email: E-posta adresi + display_name: Görüntüleme adı + created_at: Oluşturulma + auth_type: Auth türü + todo: + tags: Etiketler + show_from: Şuradan göster + project: Proje + predecessors: Değişiklik gösterir + notes: Notlar + due: Bitiş tarihi + description: Açıklama + context: içerik + project: + name: Ad + description: Açıklama + default_tags: Varsayılan etiketler + default_context_name: Varsayılan ortam + preference: + week_starts: Hafta başlama tarihi + verbose_action_descriptors: Eylem anahtar sözcüklerini (bağlam, proje) verboz + biçiminde göster + title_date_format: Başlık zaman biçimi + time_zone: Zaman dilimi + theme: Tema + staleness_starts: Stagnasyonu başlat + sms_email: E-posta'dan + sms_context: Varsayılan e-posta içeriği + show_project_on_todo_done: Yapılacaklar bitiminde proje sayfasına git + show_number_completed: Bitmiş eylemlerin sayısını göster + show_hidden_projects_in_sidebar: Gizli projeleri kenar çubuğunda göster + show_hidden_contexts_in_sidebar: Bitmiş içerikleri kenar çubuğunda göster + show_completed_projects_in_sidebar: Bitmiş projeleri kenar çubuğunda göster + review_period: Proje yenilenme aralığı + refresh: Yenilenme aralığı (dakika) + mobile_todos_per_page: Sayfa başı eylem sayısı (Mobil Görünüm) + locale: Lokal + email: E-posta + last_name: Soyad + first_name: İlk ad + due_style: Bitiş şekli + date_format: Tarih formatı + note: + updated_at: Güncellenme tarihi + created_at: Oluşturulma tarihi From 709dfd7248c5c17f6c0b488d4044483dc66eb959 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Sep 2021 00:09:43 +0000 Subject: [PATCH 361/767] Bump puma from 5.4.0 to 5.5.0 Bumps [puma](https://github.com/puma/puma) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.4.0...v5.5.0) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 40a523ef..b1072e8d 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'acts_as_list' gem 'bcrypt', '~> 3.1.16' gem 'htmlentities' gem 'paperclip' -gem 'puma', '~> 5.4' +gem 'puma', '~> 5.5' gem 'rails_autolink' gem 'RedCloth' gem 'sanitize', '~> 6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7ce44ebd..9bc1d163 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.4.0) + puma (5.5.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -341,7 +341,7 @@ DEPENDENCIES mysql2 (~> 0.5.3) paperclip pg (~> 1.2.3) - puma (~> 5.4) + puma (~> 5.5) rack-mini-profiler rails (~> 6.0.3) rails-controller-testing From 05e6f45044fd95be300c4bce4e787ab314d1f769 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 00:02:20 +0000 Subject: [PATCH 362/767] Bump solargraph from 0.43.0 to 0.43.1 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.43.0 to 0.43.1. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.43.0...v0.43.1) --- updated-dependencies: - dependency-name: solargraph dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9bc1d163..eea2baec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,7 +160,7 @@ GEM mocha (1.13.0) mysql2 (0.5.3) nio4r (2.5.8) - nokogiri (1.12.2) + nokogiri (1.12.4) mini_portile2 (~> 2.6.1) racc (~> 1.4) paperclip (6.1.0) @@ -260,7 +260,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.43.0) + solargraph (0.43.1) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -304,7 +304,7 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) uniform_notifier (1.14.2) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) From 8117deb50f8dc81b271a7c52d4fb004ebfd8810a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 00:02:24 +0000 Subject: [PATCH 363/767] Bump solargraph from 0.43.1 to 0.44.0 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.43.1 to 0.44.0. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.43.1...v0.44.0) --- updated-dependencies: - dependency-name: solargraph dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eea2baec..7547e4c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,7 +160,7 @@ GEM mocha (1.13.0) mysql2 (0.5.3) nio4r (2.5.8) - nokogiri (1.12.4) + nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) paperclip (6.1.0) @@ -260,7 +260,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.43.1) + solargraph (0.44.0) backport (~> 1.2) benchmark bundler (>= 1.17.2) From cb5d2a580af0572f31264c68c5cea093c5fb6fb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 04:53:34 +0000 Subject: [PATCH 364/767] Bump nokogiri from 1.12.4 to 1.12.5 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.4 to 1.12.5. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index eea2baec..3246a5cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,7 +160,7 @@ GEM mocha (1.13.0) mysql2 (0.5.3) nio4r (2.5.8) - nokogiri (1.12.4) + nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) paperclip (6.1.0) From 8256ebdd0c16b901a0a8f48b5650b6c761dc01b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 00:02:27 +0000 Subject: [PATCH 365/767] Bump rubocop from 1.21.0 to 1.22.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.21.0 to 1.22.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.21.0...v1.22.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index b1072e8d..789b73d6 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.21', require: false + gem 'rubocop', '~> 1.22', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 7547e4c5..d1bbd0d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,16 +230,16 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.21.0) + rubocop (1.22.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.11.0) + rubocop-ast (1.12.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -348,7 +348,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.21) + rubocop (~> 1.22) sanitize (~> 6.0) sassc-rails (~> 2.1.2) simplecov From 72c394e1bb882b5d93a35eb3176a4dac9acdbe8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 00:02:01 +0000 Subject: [PATCH 366/767] Bump rubocop from 1.22.0 to 1.22.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.0 to 1.22.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.22.0...v1.22.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d1bbd0d7..6a232fa8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,7 +230,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.22.0) + rubocop (1.22.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) From e28ff075782128f25908383c02249ae8059b6ae5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 00:02:00 +0000 Subject: [PATCH 367/767] Bump puma from 5.5.0 to 5.5.2 Bumps [puma](https://github.com/puma/puma) from 5.5.0 to 5.5.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.5.0...v5.5.2) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a232fa8..415af4d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.5.0) + puma (5.5.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) From 9cca401810067283c4526ac7a08640f082264398 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Oct 2021 00:02:32 +0000 Subject: [PATCH 368/767] Bump rubocop from 1.22.1 to 1.22.3 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.1 to 1.22.3. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.22.1...v1.22.3) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a232fa8..821e0ee1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,7 +230,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.22.1) + rubocop (1.22.3) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) From 43961f550681d0ce315578cd6b3a43cdf8b479be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 00:09:26 +0000 Subject: [PATCH 369/767] Bump i18n-tasks from 0.9.34 to 0.9.35 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.34 to 0.9.35. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.34...v0.9.35) --- updated-dependencies: - dependency-name: i18n-tasks dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 789b73d6..a2df9b18 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ group :development do gem 'rack-mini-profiler' gem 'solargraph' - gem 'i18n-tasks', '~> 0.9.34' + gem 'i18n-tasks', '~> 0.9.35' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 6a232fa8..3a59ad08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,9 +112,9 @@ GEM activesupport (>= 5.0) highline (2.0.3) htmlentities (4.3.4) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.34) + i18n-tasks (0.9.35) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -139,7 +139,7 @@ GEM listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.11.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -175,7 +175,7 @@ GEM pg (1.2.3) puma (5.5.0) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-mini-profiler (2.3.3) rack (>= 1.2.0) @@ -203,7 +203,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rails-i18n (6.0.0) i18n (>= 0.7, < 2) @@ -284,8 +284,8 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - terminal-table (3.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) @@ -304,14 +304,14 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.8.0) + unicode-display_width (2.1.0) uniform_notifier (1.14.2) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.1) yard (0.9.26) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby @@ -332,7 +332,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.15.1) htmlentities - i18n-tasks (~> 0.9.34) + i18n-tasks (~> 0.9.35) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen From d0646485f0ed141e007151b513a87735db3c2196 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 15 Nov 2021 11:57:35 +0200 Subject: [PATCH 370/767] Package updates --- Gemfile.lock | 113 +++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 566313b0..137e94f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,26 +4,26 @@ GEM RedCloth (4.3.2) aasm (5.2.0) concurrent-ruby (~> 1.0) - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.0.4.1) + actionpack (= 6.0.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.0.4.1) + actionpack (= 6.0.4.1) + activejob (= 6.0.4.1) + activerecord (= 6.0.4.1) + activestorage (= 6.0.4.1) + activesupport (= 6.0.4.1) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.0.4.1) + actionpack (= 6.0.4.1) + actionview (= 6.0.4.1) + activejob (= 6.0.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.0.4.1) + actionview (= 6.0.4.1) + activesupport (= 6.0.4.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -31,36 +31,36 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.0.4.1) + actionpack (= 6.0.4.1) + activerecord (= 6.0.4.1) + activestorage (= 6.0.4.1) + activesupport (= 6.0.4.1) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.4.1) + activesupport (= 6.0.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.0.4.1) + activesupport (= 6.0.4.1) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) + activemodel (6.0.4.1) + activesupport (= 6.0.4.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - marcel (~> 0.3.1) - activesupport (6.0.3.4) + activerecord (6.0.4.1) + activemodel (= 6.0.4.1) + activesupport (= 6.0.4.1) + activestorage (6.0.4.1) + actionpack (= 6.0.4.1) + activejob (= 6.0.4.1) + activerecord (= 6.0.4.1) + marcel (~> 1.0.0) + activesupport (6.0.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -144,8 +144,7 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.2) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) @@ -153,7 +152,7 @@ GEM mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.1.0) + mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.14.4) minitest-stub-const (0.6) @@ -181,20 +180,20 @@ GEM rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + rails (6.0.4.1) + actioncable (= 6.0.4.1) + actionmailbox (= 6.0.4.1) + actionmailer (= 6.0.4.1) + actionpack (= 6.0.4.1) + actiontext (= 6.0.4.1) + actionview (= 6.0.4.1) + activejob (= 6.0.4.1) + activemodel (= 6.0.4.1) + activerecord (= 6.0.4.1) + activestorage (= 6.0.4.1) + activesupport (= 6.0.4.1) bundler (>= 1.3.0) - railties (= 6.0.3.4) + railties (= 6.0.4.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -210,9 +209,9 @@ GEM railties (>= 6.0.0, < 7) rails_autolink (1.1.6) rails (> 3.1) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.0.4.1) + actionpack (= 6.0.4.1) + activesupport (= 6.0.4.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -279,9 +278,9 @@ GEM sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.3.0) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) terminal-table (3.0.2) From ab57aa34023e80648f1ab66d5e877fe03f262cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=83=D0=BD=D0=BE=D0=B2?= Date: Tue, 21 Sep 2021 19:37:28 +0000 Subject: [PATCH 371/767] Translated using Weblate (Russian) Currently translated at 96.5% (1078 of 1116 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/ --- config/locales/ru.yml | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index ba9a53b1..d03c299f 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -27,6 +27,7 @@ ru: verbose_action_descriptors: Подробные описания действий week_starts: Неделя начинается с theme: Тема + email: Email project: default_context_name: Контекст по-умолчанию default_tags: Метки по-умолчанию @@ -102,7 +103,6 @@ ru: one: действий few: действие many: действия - other: действия add: Добавить ajaxError: От сервера была получена ошибка back: Назад @@ -135,10 +135,9 @@ ru: none: Не задано not_available_abbr: н/д note: - few: "%{count} записи" - one: 1 запись - other: '%{count} записи' - zero: нет записей + one: нет записей + few: 1 запись + many: '%{count} записи' notes: Заметки numbered_step: Шаг %{number} ok: ОК @@ -1080,7 +1079,6 @@ ru: one: Отложить на 1 день few: Отложить на %{count} дня many: Отложить на %{count} дней - other: Отложить на %{count} дней deferred_actions_with: Отложенные действия с меткой '%{tag_name}' deferred_pending_actions: Отложенные/ожидающие действия deferred_tasks_title: TRACKS::Отложенные @@ -1358,12 +1356,26 @@ ru: multi_page: Отображено %{model} %{from} - %{to} из %{count} multi_page_html: Отображено %{model} %{from} - %{to} из %{count} single_page: - one: Отображён 1 %{model} - other: Отображены все %{count} %{model} - zero: '%{model} не найден' + one: '%{model} не найден' + few: Отображён 1 %{model} + many: Отображены все %{count} %{model} single_page_html: - one: Отображен 1 %{model} - other: Отображены все %{count} %{model} - zero: '%{model} не найден' + one: '%{model} не найден' + few: Отображен 1 %{model} + many: Отображены все %{count} %{model} page_gap: "…" previous_label: "← Пред" + rest_help: + intro: + content_2: Tracks REST API позволяет разработчикам интегрировать Tracks с другими + приложениями. Это позволяет приложениям получать доступ и изменять данные + Tracks, кроме того реализован вариант чистого (Vanilla) XML поверх HTTP. + content: В Tracks есть возможность интеграции со скриптами, web-сервисами и + другими приложениями. На этой странице представлена документация по нашему + REST API. + title: Вступление + curl_link_text: cURL + id: ID + title: Документация REST API для разаработчиков + auth_type: + database: База данных From 78574462ea877c33aa7dac07d9b96bcb9c1f244e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20H=C3=BCseyin=20Ekseli?= Date: Tue, 26 Oct 2021 08:05:58 +0000 Subject: [PATCH 372/767] Translated using Weblate (Turkish) Currently translated at 26.9% (301 of 1116 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/tr/ --- config/locales/tr.yml | 148 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/config/locales/tr.yml b/config/locales/tr.yml index f2cb7447..bc7fb048 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -17,6 +17,37 @@ data: yazsın mı? %{e} invalid_csv: 'Geçersiz CSV: headerler okunamadı: %{e}' file_blank: Dosya boş olamaz + paste_field: 'İçe aktarılan YAML dosyasının içeriğini aşağıdaki metin kutucuğuna + yapıştır:' + warning: Dikkat + yaml_warning: '%{warning}: YAML dosyası dışa aktarılmadan önce mevcut bütün bilgileriniz + kaybolacak. Herhangi bir sorun yaşama ihtimalinize karşılık, eğer veri tabanına + şu anda erişiminiz var ise yedeklemenizi öneririz.' + export: + page_title: Tracks::Export + title: Dışa aktarılıyor + format_header: 'Aşağıdaki biçimleri seçebilirsiniz:' + csv_actions_description: CSV dosyası bütün eylemlerinizi, isimlendirilmiş içeriklerinizi + ve projelerinizi içerir + csv_notes_description: CSV dosyası bütün notlarınızı içerir + yaml_link_description: YAML dosyası bütün eylemlerinizi, içeriklerinizi, projelerinizi, + etiketlerinizi ve notlarınızı içerir + csv_notes_title: CSV dosyası (sadece notlar) + xml_link_title: XML dosyası (sadece eylemler) + yaml_description: ':{yaml}: Dışarı aktarmak için en iyisidir.' + download_link: İndirme bağlantısı + yaml_link_title: YAML dosyası + xml_description: '%{xml}: Veri aktarımı ve düzenleme için en iyisidir' + yaml_experimental: Lütfen YAML dosyalarının deneysel olarak desteklendiğini göz + önünde bulundurunuz. Önemli verileri yedeklerken dikkatli olunuz. + csv_description: '%{csv}: İş tablosuna veya veri analizi yazılımlarına aktarmak + için en iyisidir' + xml_link_description: XML dosyası bütün eylemlerinizi, içeriklerinizi, projelerinizi, + etiketlerinizi ve notlarınızı içerir + csv_actions_title: CSV dosyası (eylemler, içerikler ve projeler) + yaml: YAML + csv: CSV + xml: XML contexts: visible_contexts: Görünür içerikler view_link: '%{name} içeriğini görüntüle' @@ -203,3 +234,120 @@ activerecord: note: updated_at: Güncellenme tarihi created_at: Oluşturulma tarihi +date: + abbr_day_names: + - Pa + - Pt + - Pe + - Cu + - Ct + abbr_month_names: + - Kas + - Oca + - Şub + - Mar + - Nis + - May + - Haz + - Tem + - Ağu + - Eyl + - Eki + day_names: + - Pazar + - Pazartesi + - Salı + - Çarşamba + - Perşembe + - Cuma + - Cumartesi + formats: + default: '%d/%m/%Y' + short: '%d %b' + long: '%d-%m-%Y' + longer: '%A %d %B, %Y' + month_names: + - Ocak + - Şubat + - Eylül + - Mart + - Nisan + - Mayıs + - Haziran + - Temmuz + - Ağustos + - Ekim + - Kasım + - Aralık + order: + - :yıl + - :gün +datetime: + prompts: + day: Gün + hour: Saat + minute: Dakika + month: Ay + year: Yıl + second: Saniye + distance_in_words: + almost_x_years: + one: neredeyse 1 yıl + other: neredeyse %{count} yıl + half_a_minute: yarım dakika + x_seconds: + one: 1 saniye + other: '%{count} saniye' + x_days: + one: 1 gün + other: '%{count} gün' + x_months: + one: 1 ay + other: '%{count} ay' + about_x_months: + one: yaklaşık 1 ay + other: yaklaşık %{count} ay + about_x_hours: + one: yaklaşık 1 saat + other: yaklaşık %{count} saat + about_x_years: + one: yaklaşık 1 yıl + other: yaklaşık %{count} yıl + x_minutes: + one: 1 dakika + other: '%{count} dakika' + over_x_years: + one: 1 yıldan fazla + other: '%{count} yıldan fazla' +errors: + messages: + blank: boş bırakılamaz + less_than: "%{count}'dan az olmalıdır" + not_a_number: bir sayı değildir + other_than: "%{count}'dan farklı olmalıdır" + present: boş olmalıdır + taken: daha önceden alınmış + not_an_integer: integer olmalıdır + odd: tek sayı olmalıdır + too_long: çok uzun (en fazla %{count} karakter olabilir) + too_short: çok kısa ( en az %{count} karakter olabilir) + accepted: kabul edilmelidir + confirmation: '%{attribute} ile eşleşmemektedir' + empty: boş bırakılamaz + equal_to: '%{count} ile eşit olmalıdır' + inclusion: listeye dahil değildir + invalid: geçersiz + less_than_or_equal_to: "%{count}'dan az veya eşit olmalıdır" + wrong_length: yanlış uzunluk (karakter sayısı %{count} kadar olmalıdır) + even: eşit olmalıdır + greater_than_or_equal_to: "%{count}'dan büyük veya eşit olmalıdır" + exclusion: daha önceden alınmış + greater_than: "%{count}'dan büyük olmalıdır" + format: '%{attribute} %{message}' + user_unauthorized: '401 Yetkisiz: sadece yetkili kullanıcılar bu özelliğe erişime + sahiptir.' +feedlist: + actions_completed_last_week: Son 7 günde tamamlanan eylemler + actions_due_next_week: 7 gün veya daha önce bitecek eylemler + actions_due_today: Bugün veya daha erken bitecek olan eylemler + active_projects_wo_next: Eylemi bulunmayan aktif projeler From d6448916d407d2b341ab78e8bbade5eb18b70e2b Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 15 Nov 2021 12:17:06 +0200 Subject: [PATCH 373/767] Fix the plurals --- config/locales/ru.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index d03c299f..7ce28538 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -103,6 +103,7 @@ ru: one: действий few: действие many: действия + other: действия add: Добавить ajaxError: От сервера была получена ошибка back: Назад @@ -135,9 +136,10 @@ ru: none: Не задано not_available_abbr: н/д note: - one: нет записей - few: 1 запись - many: '%{count} записи' + few: "%{count} записи" + one: 1 запись + other: '%{count} записи' + zero: нет записей notes: Заметки numbered_step: Шаг %{number} ok: ОК @@ -1079,6 +1081,7 @@ ru: one: Отложить на 1 день few: Отложить на %{count} дня many: Отложить на %{count} дней + other: Отложить на %{count} дней deferred_actions_with: Отложенные действия с меткой '%{tag_name}' deferred_pending_actions: Отложенные/ожидающие действия deferred_tasks_title: TRACKS::Отложенные @@ -1356,13 +1359,13 @@ ru: multi_page: Отображено %{model} %{from} - %{to} из %{count} multi_page_html: Отображено %{model} %{from} - %{to} из %{count} single_page: - one: '%{model} не найден' - few: Отображён 1 %{model} - many: Отображены все %{count} %{model} + one: Отображён 1 %{model} + other: Отображены все %{count} %{model} + zero: '%{model} не найден' single_page_html: - one: '%{model} не найден' - few: Отображен 1 %{model} - many: Отображены все %{count} %{model} + one: Отображен 1 %{model} + other: Отображены все %{count} %{model} + zero: '%{model} не найден' page_gap: "…" previous_label: "← Пред" rest_help: From 91a714cff155e596e4abe67603048ea3c521669a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 00:03:26 +0000 Subject: [PATCH 374/767] Bump rubocop from 1.22.3 to 1.23.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.3 to 1.23.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.22.3...v1.23.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a2df9b18..1798a278 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.22', require: false + gem 'rubocop', '~> 1.23', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 137e94f5..5228c0fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,7 +229,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.22.3) + rubocop (1.23.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -238,7 +238,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.12.0) + rubocop-ast (1.13.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -347,7 +347,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.22) + rubocop (~> 1.23) sanitize (~> 6.0) sassc-rails (~> 2.1.2) simplecov From 98a99f4bf44a8c82c17f209b91d5e1a995f49710 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 00:02:09 +0000 Subject: [PATCH 375/767] Bump solargraph from 0.44.0 to 0.44.2 Bumps [solargraph](https://github.com/castwide/solargraph) from 0.44.0 to 0.44.2. - [Release notes](https://github.com/castwide/solargraph/releases) - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](https://github.com/castwide/solargraph/compare/v0.44.0...v0.44.2) --- updated-dependencies: - dependency-name: solargraph dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5228c0fe..d8b9d56f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM execjs backport (1.2.0) bcrypt (3.1.16) - benchmark (0.1.1) + benchmark (0.2.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -222,7 +222,7 @@ GEM ffi (~> 1.0) ref (2.0.0) regexp_parser (2.1.1) - reverse_markdown (2.0.0) + reverse_markdown (2.1.1) nokogiri rexml (3.2.5) rspec-expectations (3.10.1) @@ -259,7 +259,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - solargraph (0.44.0) + solargraph (0.44.2) backport (~> 1.2) benchmark bundler (>= 1.17.2) From ada726f1e87eb027eb9bc88b58831fcf9a2b1efb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 00:02:17 +0000 Subject: [PATCH 376/767] Bump spring from 3.0.0 to 3.1.0 Bumps [spring](https://github.com/rails/spring) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/rails/spring/releases) - [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md) - [Commits](https://github.com/rails/spring/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: spring dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5228c0fe..029987e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - spring (3.0.0) + spring (3.1.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) From d09c88f78d789c1380dedd9eda97012735658bac Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 24 Nov 2021 19:27:27 +0000 Subject: [PATCH 377/767] Translated using Weblate (Finnish) Currently translated at 100.0% (1116 of 1116 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/ --- config/locales/fi.yml | 102 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 92 insertions(+), 10 deletions(-) diff --git a/config/locales/fi.yml b/config/locales/fi.yml index a64c5c92..b7553558 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -131,9 +131,8 @@ fi: none: Ei not_available_abbr: ei note: - one: 1 muistiinpano - other: "%{count} muistiinpanoa" - zero: ei muistiinpanoja + one: ei muistiinpanoja + other: 1 muistiinpano notes: Muistiinpanot numbered_step: Askel %{number} ok: Ok @@ -513,7 +512,7 @@ fi: contribute_link_text: projektin verkkosivustolta mailing_list_link_text: Sähköpostilista irc_bullet: '%{irc_link} (käytettävissä myös %{matrix_link})' - irc_link_text: 'IRC-kanava #Tracks@FreeNode' + irc_link_text: 'IRC-kanava #Tracks@Libera' matrix_link_text: Matrixin kautta layouts: mobile_navigation: @@ -1332,14 +1331,97 @@ fi: multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta single_page: - one: Näytetään 1 %{model} - other: Näytetään kaikki %{count} %{model} - zero: '%{model} ei löytynyt' + one: '%{model} ei löytynyt' + other: Näytetään 1 %{model} single_page_html: - one: Näytetään 1 %{model} - other: Näytetään kaikki %{count} %{model} - zero: '%{model} ei löytynyt' + one: '%{model} ei löytynyt' + other: Näytetään 1 %{model} page_gap: "…" previous_label: "← Edellinen" auth_type: database: Tietokanta + rest_help: + writing: + example_todo_name: Mallinna puumaja SketchUpilla + title: Rajapintaan kirjoittaminen + example_title: 'Luo uusi projekti curlilla:' + example_project_name: Rakenna puumaja lapsille + example_project_response_title: 'Vastaus on %{response_code} yhdessä otsakkeen + %{header} kanssa, joka osoittaa mistä uusi projektiresurssi löytyy. Nyt voimme + lisätä tähän projektiin uuden tehtävän käyttäen curlia:' + example_delete_response_title: Rajapinta palauttaa %{response_code} ja tehtävä + on nyt poistettu. + example_delete_title: 'Kun haluamme poistaa tehtävän, kutsumme sen yksilöllistä + resurssitunnistetta (URL-osoite) HTTP-metodilla %{delete}, jälleen curlilla:' + example_todo_response_title: 'Vastaus on jälleen %{response_code} yhdessä otsakkeen + %{header} kanssa, joka osoittaa mistä uusi tehtäväresurssi löytyy. Tehtävän + muistiinpanojen muuttaminen, jälleen curlilla:' + example_note_response_title: 'Vastaus on %{response_code} ja sen rungossa on + päivitetty tehtävä XML-muotoisena. Tarjoamme helpomman tavan muuttaa tehtävä + tehdyksi tai tekemättömäksi ilman tarvetta päivitysoperaation tekemiselle + kenttäarvoilla:' + description: Rajapinta tarjoaa mekanismit resurssien lisäämiseen, päivittämiseen + ja poistamiseen käyttämällä %{put}, %{post} ja %{delete} yhdessä sisällön + kanssa. + example_note_text: käytä vaahterakuviota + title: REST-rajapinnan dokumentaatio kehittäjille + intro: + title: Esittely + content_2: Tracksin REST-rajapinnan avulla kehittäjät voivat integroida Tracksin + sovelluksiinsa. Sen avulla sovellukset voivat lukea ja muuttaa Tracksiin tallennettuja + tietoja ja se on toteutettu XML:nä HTTP:n yli. + restful_link_text: RESTful + content: Tracks on suunniteltu integroitavaksi skripteihin, verkkopalveluihin + ja kolmannen osapuolen sovelluksiin. Tämä sivu toimii REST-rajapintamme dokumentaationa. + content_3: Rajapinta on %{restful_link}-palvelu. Kaikki tieto on saatavilla + rajapinnan kautta resursseina, joihin voidaan viitata yksilöllisellä tunnisteella. + Rajapinta vastaa lajitelmaan HTTP-kutsuja (GET, PUT, POST ja UPDATE) ja kaikki + rajapinnan vastaukset ovat XML-muotoiltua UTF-8:aa. + auth: + title: Tunnistautuminen + content: Tunnistautuminen tapahtuu %{auth_link}. Tracksin käyttäjätunnusta ja + salasanaa käytetään rajapinnan tunnisteina. Huomaathan, että Basic-HTTP-tunnistautumisessa + salasanasi lähetetään pelkkänä tekstinä. Jos tarvitset turvallisempaa tunnistautumisratkaisua, + asenna verkkopalvelimesi palvelemaan Tracks HTTPS:n yli. + basic_auth_link_text: Basic-HTTP-tunnistautuminen + retrieve: + content: 'Noutaaksesi tietoa sinun tarvitsee vain tehdä HTTP GET-pyyntö resurssitunnisteella. + Esimerkiksi jos haluat hakea kaikki asiayhteydet %{curl_link}illa:' + single_context: 'Yksittäisen asiayhteyden noutaminen:' + todos_from_context: 'Asiayhteyteen kuuluvien tehtävien noutaminen:' + projects: Voit käyttää yllä esitettyä muotoa myös projekteilla asiayhteyksien + sijaan. + paths_title: 'Kaikki tiedot ovat saatavilla seuraavissa resurssipoluissa:' + active_todos: 'Jos haluat noutaa vain aktiiviset tehtävät, voit lisätä parametrin + %{active_code} ja asettaa siihen jonkin arvon, kuten:' + title: Tiedon noutaminen rajapinnasta + limit: 'Tehtäväresursseille (tehtävät, tickler, tehdyt, piilotetut ja kalenteri) + voit palauttaa vain kentät %{fields} lisäämällä parametrin %{limit_parameter} + ja asettamalla sen arvoksi %{set_to}. Esimerkiksi:' + notes: + description: 'Ohjeessa on noudatettu muutamia merkintötapoja:' + curl_description: Kaikki esimerkit käyttävät %{curl}ia. + bullet2: '%{omit} osoittaa että epäolennaisia osuuksia vastaustiedosta on jätetty + pois ohjeen selkiyttämiseksi' + bullet1: '%{id} resurssin %{url} osoittavat että se tulee korvata resurssin + yksilöllisellä tunnisteella' + title: Huomioita ohjeesta + activeresource: + title: Rajapinnan käyttäminen ActiveResourcella + wrapper_description: '%{signals_link}in Highrise-wrapperin innostamana teimme + pienen Ruby-wrapperin (löytyy doc/-hakemistosta) rajapinnalle joka luo sinulle + ActiveResource-mallit joilla voit leikkiä IRB-istunnossa:' + ror_link_text: Ruby on Rails + signals_link_text: 37 Signals + activeresource_link_text: ActiveResource + description: '%{activeresource_link} on ohut mutta hyödyllinen RESTful-palveluiden + ympärillä %{ror_link}issa oleva palvelu. Se tulee olemaan osa Rails 2.0:aa, + mutta siihen asti voit noutaa sen %{gem_command}.' + response: + xml_description: 'XML tyhjälle listalle näyttää tältä, jälleen curlilla:' + title: Vastauksen ja vastauskoodin käsittely + description: Kaikki onnistuneet toiminnot palauttavat tilakoodin %{response_200} + tai %{response_201} riippuen toiminnosta. Joissain tapauksissa listassa, esimerkiksi + %{example_call} ei ole lainkaan tuloksia, jolloin palautetaan tyhjä lista. + curl_link_text: cURL + id: ID From eb61d0a29222518c500f6aadf6c0775f07cdae84 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 24 Nov 2021 21:44:32 +0200 Subject: [PATCH 378/767] Fix again the broken plurals --- config/locales/fi.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/config/locales/fi.yml b/config/locales/fi.yml index b7553558..41ced1b2 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -131,8 +131,9 @@ fi: none: Ei not_available_abbr: ei note: - one: ei muistiinpanoja - other: 1 muistiinpano + one: 1 muistiinpano + other: "%{count} muistiinpanoa" + zero: ei muistiinpanoja notes: Muistiinpanot numbered_step: Askel %{number} ok: Ok @@ -1331,11 +1332,13 @@ fi: multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä %{count} tietueesta single_page: - one: '%{model} ei löytynyt' - other: Näytetään 1 %{model} + one: Näytetään 1 %{model} + other: Näytetään kaikki %{count} %{model} + zero: '%{model} ei löytynyt' single_page_html: - one: '%{model} ei löytynyt' - other: Näytetään 1 %{model} + one: Näytetään 1 %{model} + other: Näytetään kaikki %{count} %{model} + zero: '%{model} ei löytynyt' page_gap: "…" previous_label: "← Edellinen" auth_type: From 573472c2623b51980f8170026be664f1de59f3dd Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 24 Nov 2021 22:16:47 +0200 Subject: [PATCH 379/767] Few installation doc updates --- doc/installation.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/installation.md b/doc/installation.md index 60cdfa21..f3a0036b 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -50,8 +50,8 @@ Tracks container. In future there should be an official image in Docker Hub. You 1. Make sure you have Docker properly installed. 2. Start a database container with either MySQL or PostgreSQL: ``` - $ docker run -p 5432:5432 --name postgres -e POSTGRES_PASSWORD=password -d postgres - $ docker run -p 3306:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=password -d mariadb + $ docker run -d -p 5432:5432 --name postgres -e POSTGRES_PASSWORD=password -d postgres + $ docker run -d -p 3306:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=password -d mariadb ``` 3. Create a database and a user for Tracks in the database: ``` @@ -72,8 +72,8 @@ Tracks container. In future there should be an official image in Docker Hub. You ``` 5. Start the Tracks server: ``` - $ docker run -p 3000:3000 --name tracks --link mariadb:db -t tracks - $ docker run -p 3000:3000 --name tracks --link postgres:db -t tracks + $ docker run -d -p 3000:3000 --name tracks --link mariadb:db -t tracks + $ docker run -d -p 3000:3000 --name tracks --link postgres:db -t tracks ``` 6. You should now be able to access Tracks in http://localhost:3000 @@ -153,13 +153,13 @@ Tracks is built upon a number of Ruby libraries (known as ‘gems’). The Bundl * If you are using SQLite: ``` - bundle install --without development test mysql + bundle install --without "development test mysql" ``` * If you are using MySQL: ``` - bundle install --without development test sqlite + bundle install --without "development test sqlite" ``` * If you are installing Tracks on Windows or Mac OS X, or if you have another JavaScript runtime such as Node.js installed, you may also append `therubyracer` as an additional "without" parameter. From 448c8d6e323d631ad1e14026d41ae313db2cd77c Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 24 Nov 2021 22:19:26 +0200 Subject: [PATCH 380/767] Missing line from changelog --- doc/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index b2223cef..4916178f 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -4,6 +4,7 @@ See doc/upgrading.md for the upgrade documentation! ### New features +* Whole Tracks is now translatable. * New Finnish locale by the maintainer Jyri-Petteri ”ZeiP” Paloposki. * Update last login field when validating an existing login. * Show more users in the user list and allow changing the order criteria. From 9a109c13cbe2ce5b992178f140eec65560a630a2 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 24 Nov 2021 22:21:29 +0200 Subject: [PATCH 381/767] Next release version number --- config/initializers/tracks.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb index a114fafa..d3666fa7 100644 --- a/config/initializers/tracks.rb +++ b/config/initializers/tracks.rb @@ -1,4 +1,4 @@ -tracks_version='2.5.2' +tracks_version='2.5.3' # comment out next two lines if you do not want (or can not) the date of the # last git commit in the footer info=`git log --pretty=format:"%ai" -1` From 8800bab8a97e095eb9f2b2f9507701f23d662bd5 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 25 Nov 2021 01:10:38 +0200 Subject: [PATCH 382/767] Fix using most recent versions of the Ruby images in the CI --- Dockerfile | 2 +- Dockerfile-2.5 | 2 +- Dockerfile-2.6 | 2 +- script/poll-for-db | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 303b86b7..a68b373d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.1 +FROM ruby:2.7 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 diff --git a/Dockerfile-2.5 b/Dockerfile-2.5 index f453241e..f14decab 100644 --- a/Dockerfile-2.5 +++ b/Dockerfile-2.5 @@ -1,4 +1,4 @@ -FROM ruby:2.5.7 +FROM ruby:2.5 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 diff --git a/Dockerfile-2.6 b/Dockerfile-2.6 index 0bef7e0e..ee5f7de3 100644 --- a/Dockerfile-2.6 +++ b/Dockerfile-2.6 @@ -1,4 +1,4 @@ -FROM ruby:2.6.5 +FROM ruby:2.6 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 diff --git a/script/poll-for-db b/script/poll-for-db index 97f1c794..f6877f34 100755 --- a/script/poll-for-db +++ b/script/poll-for-db @@ -4,7 +4,7 @@ appdir=$(cd $(dirname "$0")/.. && pwd) [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@ for i in {1..60}; do - curl -sf db:3306 >/dev/null && exit + curl -sf telnet://db:3306 >/dev/null && exit sleep 1 done From bfc0c0825c3639748876306a095d6738a37edd71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 00:02:18 +0000 Subject: [PATCH 383/767] Bump spring from 3.1.0 to 3.1.1 Bumps [spring](https://github.com/rails/spring) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/rails/spring/releases) - [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md) - [Commits](https://github.com/rails/spring/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: spring dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28b59962..dc17c56b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - spring (3.1.0) + spring (3.1.1) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) From 41538efb9e17f6a9f660dd1c403c6b4fa3dcdc00 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 29 Nov 2021 21:37:44 +0200 Subject: [PATCH 384/767] Use the script in bin/ for running the rails server in the Docker image. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a68b373d..db32b135 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,4 +27,4 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"] EXPOSE 3000 -CMD ["rails", "server", "-b", "0.0.0.0"] +CMD ["./bin/rails", "server", "-b", "0.0.0.0"] From aedede44ba19e578e2e6845c53643397a6286e39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 00:03:07 +0000 Subject: [PATCH 385/767] Bump yard from 0.9.26 to 0.9.27 Bumps [yard](https://github.com/lsegal/yard) from 0.9.26 to 0.9.27. - [Release notes](https://github.com/lsegal/yard/releases) - [Changelog](https://github.com/lsegal/yard/blob/main/CHANGELOG.md) - [Commits](https://github.com/lsegal/yard/compare/v0.9.26...v0.9.27) --- updated-dependencies: - dependency-name: yard dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dc17c56b..6a865af7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -305,11 +305,13 @@ GEM execjs (>= 0.3.0, < 3) unicode-display_width (2.1.0) uniform_notifier (1.14.2) + webrick (1.7.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.1) - yard (0.9.26) + yard (0.9.27) + webrick (~> 1.7.0) zeitwerk (2.5.1) PLATFORMS From d48e3739ffe05a31115590c885b0e6b3e694041a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 00:13:22 +0000 Subject: [PATCH 386/767] Bump bullet from 6.1.5 to 7.0.0 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.5 to 7.0.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.5...7.0.0) --- updated-dependencies: - dependency-name: bullet dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a865af7..ad5b9291 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - bullet (6.1.5) + bullet (7.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -154,7 +154,7 @@ GEM rake mini_mime (1.1.2) mini_portile2 (2.6.1) - minitest (5.14.4) + minitest (5.15.0) minitest-stub-const (0.6) mocha (1.13.0) mysql2 (0.5.3) From 1b21416a5df7ed5631789cc3c8fcefb1d0833097 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 00:02:32 +0000 Subject: [PATCH 387/767] Bump i18n-tasks from 0.9.35 to 0.9.36 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.35 to 0.9.36. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.35...v0.9.36) --- updated-dependencies: - dependency-name: i18n-tasks dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 1798a278..6c9e8ab8 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ group :development do gem 'rack-mini-profiler' gem 'solargraph' - gem 'i18n-tasks', '~> 0.9.35' + gem 'i18n-tasks', '~> 0.9.36' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index ad5b9291..bee1da31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.35) + i18n-tasks (0.9.36) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -139,7 +139,7 @@ GEM listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.12.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -169,7 +169,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.21.0) - parser (3.0.2.0) + parser (3.0.3.2) ast (~> 2.4.1) pg (1.2.3) puma (5.5.2) @@ -333,7 +333,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.15.1) htmlentities - i18n-tasks (~> 0.9.35) + i18n-tasks (~> 0.9.36) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen From e0d07bac0acd4bfb33c4573c79b4f8b03eec5d12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 00:10:08 +0000 Subject: [PATCH 388/767] Bump rubocop from 1.23.0 to 1.24.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.23.0 to 1.24.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.23.0...v1.24.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 6c9e8ab8..b160a52f 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ end group :development, :test do gem 'byebug' gem 'listen' - gem 'rubocop', '~> 1.23', require: false + gem 'rubocop', '~> 1.24', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index bee1da31..56aa22fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,7 +169,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.21.0) - parser (3.0.3.2) + parser (3.1.0.0) ast (~> 2.4.1) pg (1.2.3) puma (5.5.2) @@ -221,7 +221,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - regexp_parser (2.1.1) + regexp_parser (2.2.0) reverse_markdown (2.1.1) nokogiri rexml (3.2.5) @@ -229,16 +229,16 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.1) - rubocop (1.23.0) + rubocop (1.24.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.12.0, < 2.0) + rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.13.0) + rubocop-ast (1.15.1) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) safe_yaml (1.0.5) @@ -349,7 +349,7 @@ DEPENDENCIES rails-dom-testing (~> 2.0.0) rails_autolink rspec-expectations - rubocop (~> 1.23) + rubocop (~> 1.24) sanitize (~> 6.0) sassc-rails (~> 2.1.2) simplecov From a798acd691cc03ba9c4b9e42918171db15ac8a5c Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 3 Jan 2022 13:01:32 +0200 Subject: [PATCH 389/767] Remove testing for Ruby 2.5 --- .github/workflows/continuous-integration.yml | 6 +----- doc/CHANGELOG.md | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 33de64c0..20bdb8dc 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -6,13 +6,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ["2.5", "2.6", "2.7"] + ruby: ["2.6", "2.7"] db: [sqlite, mysql, postgres] exclude: - - ruby: "2.5" - db: sqlite - - ruby: "2.5" - db: postgres - ruby: "2.6" db: sqlite - ruby: "2.6" diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 4916178f..ab3a3778 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,5 +1,11 @@ See doc/upgrading.md for the upgrade documentation! +## Version 2.6 + +## Removed features + +* No longer supporting EOL Ruby 2.5 + ## Version 2.5.2 ### New features From 0599d7454f7bf93d2908074b73fb8c03c13d965c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20H=C3=BCseyin=20Ekseli?= Date: Wed, 29 Dec 2021 09:35:27 +0000 Subject: [PATCH 390/767] Translated using Weblate (Turkish) Currently translated at 30.0% (335 of 1116 strings) Translation: Tracks/Tracks Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/tr/ --- config/locales/tr.yml | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/config/locales/tr.yml b/config/locales/tr.yml index bc7fb048..0d4e107f 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -351,3 +351,51 @@ feedlist: actions_due_next_week: 7 gün veya daha önce bitecek eylemler actions_due_today: Bugün veya daha erken bitecek olan eylemler active_projects_wo_next: Eylemi bulunmayan aktif projeler + all_projects: Bütün Projeler + choose_context: Almak istediğiniz içeriği seçin + projects_and_actions: Aktif projeler ve eylemleri + rss_feed: RSS Akışı + active_starred_actions: Yıldızlı, etkin eylemler + all_actions: Tüm eylemler + all_contexts: Bütün İçerikler + choose_project: Almak istediğiniz projeyi seçin + context_centric_actions: Belirli bir içerikteki tamamlanmamış eylemler için akış + context_needed: Akış talep etmeden önce en az bir içerik olmalı + ical_feed: iCal akış + last_fixed_number: Son %{number} eylem/ler + legend: 'Semboller:' + notice_incomplete_only: "Not: Akış, aksi işaretlenmedikçe sadece tamamlanmamış eylemleri\ + \ gösterir. Bu iCal akışları todo listesine eklenebilir. Eğer bitimi yaklaşan\ + \ todo'ları takvimde görüntülemek istiyorsanız, takvim sayfasından iCal akışını\ + \ kullanın" + plain_text_feed: Düz Yazı Akışı + project_centric: Belirli bir projedeki tamamlanmamış eylemler akışı + project_needed: Akış talep etmeden önce en az bir proje olmalı + select_feed_for_context: Bu içerik için akış seçin + select_feed_for_project: Bu proje için akış seçin +integrations: + sections: + email_rich: Zengin Todo Mesaj e-posta formatı + message_gateway: Tracks aracılığıyla e-posta gönderebilmek için Tracks'ı e-posta + serverine bağlayın + automatic_email: Yaklaşan eylemler için kendinize otomatik e-posta gönderin + mailgun: Mailgun aracılığıyla Tracks'a e-posta gönder + opensearch_description: Tracks'ta ara + title: Entegrasyonlar + add_your_own: Eklemek istediğiniz araç mı var? Tracks'ın gelecek sürümlerine ekleyebilmemiz + için bize gönderin %{tell_us_link}. + intro: 'Tracks işinize yarayabilecek diğer araçlarla entegre edilebilir! Bu sayfa + bazılarını entegre etmeye yönelik bilgi içerir. Her platforma uygulanabilir olmayabilirler + ve bazıları diğerlerine kıyasla daha fazla teknik bilgi gerektirebilir. Ek bilgi + için: %{documentation_link}' + developer_documentation_link: Tracks için geliştirici dokümantasyonu + contents_header: 'İçerikler:' +footer: + send_feedback: Geri bildirim gönderin %{version} +helpers: + select: + prompt: Seçiniz + submit: + create: Oluştur %{model} + submit: Kaydet %{model} + update: Güncelle %{model} From 101ade7ad5a54a79743f99894f13e8903e8970e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 16:57:15 +0000 Subject: [PATCH 391/767] Bump i18n-tasks from 0.9.36 to 0.9.37 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.36 to 0.9.37. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.36...v0.9.37) --- updated-dependencies: - dependency-name: i18n-tasks dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index b160a52f..007de181 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ group :development do gem 'rack-mini-profiler' gem 'solargraph' - gem 'i18n-tasks', '~> 0.9.36' + gem 'i18n-tasks', '~> 0.9.37' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 56aa22fe..65cf97d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.36) + i18n-tasks (0.9.37) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -204,9 +204,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-i18n (6.0.0) + rails-i18n (7.0.1) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) + railties (>= 6.0.0, < 8) rails_autolink (1.1.6) rails (> 3.1) railties (6.0.4.1) @@ -312,7 +312,7 @@ GEM will_paginate (3.3.1) yard (0.9.27) webrick (~> 1.7.0) - zeitwerk (2.5.1) + zeitwerk (2.5.3) PLATFORMS ruby @@ -333,7 +333,7 @@ DEPENDENCIES factory_bot_rails font-awesome-sass (~> 5.15.1) htmlentities - i18n-tasks (~> 0.9.36) + i18n-tasks (~> 0.9.37) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) listen From de61a086d18ff2bd49640b4a4e786084363a97bf Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 3 Jan 2022 20:16:17 +0200 Subject: [PATCH 392/767] Update Rails to next minor version --- Gemfile | 2 +- Gemfile.lock | 106 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Gemfile b/Gemfile index 007de181..bc32d458 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'coffee-rails', '~> 5.0.0' gem 'jquery-rails', '~> 4.4' gem 'jquery-ui-rails', '~>6.0.1' -gem 'rails', '~> 6.0.3' +gem 'rails', '~> 6.0.4' gem 'sassc-rails', '~> 2.1.2' gem 'bootstrap-sass', '3.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 65cf97d0..4174949a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,26 +4,26 @@ GEM RedCloth (4.3.2) aasm (5.2.0) concurrent-ruby (~> 1.0) - actioncable (6.0.4.1) - actionpack (= 6.0.4.1) + actioncable (6.0.4.4) + actionpack (= 6.0.4.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.4.1) - actionpack (= 6.0.4.1) - activejob (= 6.0.4.1) - activerecord (= 6.0.4.1) - activestorage (= 6.0.4.1) - activesupport (= 6.0.4.1) + actionmailbox (6.0.4.4) + actionpack (= 6.0.4.4) + activejob (= 6.0.4.4) + activerecord (= 6.0.4.4) + activestorage (= 6.0.4.4) + activesupport (= 6.0.4.4) mail (>= 2.7.1) - actionmailer (6.0.4.1) - actionpack (= 6.0.4.1) - actionview (= 6.0.4.1) - activejob (= 6.0.4.1) + actionmailer (6.0.4.4) + actionpack (= 6.0.4.4) + actionview (= 6.0.4.4) + activejob (= 6.0.4.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.4.1) - actionview (= 6.0.4.1) - activesupport (= 6.0.4.1) + actionpack (6.0.4.4) + actionview (= 6.0.4.4) + activesupport (= 6.0.4.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -31,36 +31,36 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.0.4.1) - actionpack (= 6.0.4.1) - activerecord (= 6.0.4.1) - activestorage (= 6.0.4.1) - activesupport (= 6.0.4.1) + actiontext (6.0.4.4) + actionpack (= 6.0.4.4) + activerecord (= 6.0.4.4) + activestorage (= 6.0.4.4) + activesupport (= 6.0.4.4) nokogiri (>= 1.8.5) - actionview (6.0.4.1) - activesupport (= 6.0.4.1) + actionview (6.0.4.4) + activesupport (= 6.0.4.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.4.1) - activesupport (= 6.0.4.1) + activejob (6.0.4.4) + activesupport (= 6.0.4.4) globalid (>= 0.3.6) - activemodel (6.0.4.1) - activesupport (= 6.0.4.1) + activemodel (6.0.4.4) + activesupport (= 6.0.4.4) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.4.1) - activemodel (= 6.0.4.1) - activesupport (= 6.0.4.1) - activestorage (6.0.4.1) - actionpack (= 6.0.4.1) - activejob (= 6.0.4.1) - activerecord (= 6.0.4.1) + activerecord (6.0.4.4) + activemodel (= 6.0.4.4) + activesupport (= 6.0.4.4) + activestorage (6.0.4.4) + actionpack (= 6.0.4.4) + activejob (= 6.0.4.4) + activerecord (= 6.0.4.4) marcel (~> 1.0.0) - activesupport (6.0.4.1) + activesupport (6.0.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -108,7 +108,7 @@ GEM ffi (1.15.3) font-awesome-sass (5.15.1) sassc (>= 1.11) - globalid (0.5.2) + globalid (1.0.0) activesupport (>= 5.0) highline (2.0.3) htmlentities (4.3.4) @@ -180,20 +180,20 @@ GEM rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.4.1) - actioncable (= 6.0.4.1) - actionmailbox (= 6.0.4.1) - actionmailer (= 6.0.4.1) - actionpack (= 6.0.4.1) - actiontext (= 6.0.4.1) - actionview (= 6.0.4.1) - activejob (= 6.0.4.1) - activemodel (= 6.0.4.1) - activerecord (= 6.0.4.1) - activestorage (= 6.0.4.1) - activesupport (= 6.0.4.1) + rails (6.0.4.4) + actioncable (= 6.0.4.4) + actionmailbox (= 6.0.4.4) + actionmailer (= 6.0.4.4) + actionpack (= 6.0.4.4) + actiontext (= 6.0.4.4) + actionview (= 6.0.4.4) + activejob (= 6.0.4.4) + activemodel (= 6.0.4.4) + activerecord (= 6.0.4.4) + activestorage (= 6.0.4.4) + activesupport (= 6.0.4.4) bundler (>= 1.3.0) - railties (= 6.0.4.1) + railties (= 6.0.4.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -209,9 +209,9 @@ GEM railties (>= 6.0.0, < 8) rails_autolink (1.1.6) rails (> 3.1) - railties (6.0.4.1) - actionpack (= 6.0.4.1) - activesupport (= 6.0.4.1) + railties (6.0.4.4) + actionpack (= 6.0.4.4) + activesupport (= 6.0.4.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -278,7 +278,7 @@ GEM sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.3.0) + sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) @@ -344,7 +344,7 @@ DEPENDENCIES pg (~> 1.2.3) puma (~> 5.5) rack-mini-profiler - rails (~> 6.0.3) + rails (~> 6.0.4) rails-controller-testing rails-dom-testing (~> 2.0.0) rails_autolink From 916ec5121d82a5a338a4bcb2bae302ac8a5eca62 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 3 Jan 2022 12:21:42 +0200 Subject: [PATCH 393/767] Enable testing for Ruby 3.0 --- .github/workflows/continuous-integration.yml | 2 +- Dockerfile-2.5 => Dockerfile-3.0 | 2 +- doc/CHANGELOG.md | 4 +++ ...mysql.yml => docker-compose-3.0-mysql.yml} | 2 +- test-envs/docker-compose-3.0-postgres.yml | 32 +++++++++++++++++++ test-envs/docker-compose-3.0-sqlite.yml | 17 ++++++++++ 6 files changed, 56 insertions(+), 3 deletions(-) rename Dockerfile-2.5 => Dockerfile-3.0 (98%) rename test-envs/{docker-compose-2.5-mysql.yml => docker-compose-3.0-mysql.yml} (95%) create mode 100644 test-envs/docker-compose-3.0-postgres.yml create mode 100644 test-envs/docker-compose-3.0-sqlite.yml diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 20bdb8dc..eb9ce9fd 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ["2.6", "2.7"] + ruby: ["2.6", "2.7", "3.0"] db: [sqlite, mysql, postgres] exclude: - ruby: "2.6" diff --git a/Dockerfile-2.5 b/Dockerfile-3.0 similarity index 98% rename from Dockerfile-2.5 rename to Dockerfile-3.0 index f14decab..534d5c92 100644 --- a/Dockerfile-2.5 +++ b/Dockerfile-3.0 @@ -1,4 +1,4 @@ -FROM ruby:2.5 +FROM ruby:3.0 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index ab3a3778..5d788103 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -2,6 +2,10 @@ See doc/upgrading.md for the upgrade documentation! ## Version 2.6 +## New features + +* Ruby 3.0 is now supported. + ## Removed features * No longer supporting EOL Ruby 2.5 diff --git a/test-envs/docker-compose-2.5-mysql.yml b/test-envs/docker-compose-3.0-mysql.yml similarity index 95% rename from test-envs/docker-compose-2.5-mysql.yml rename to test-envs/docker-compose-3.0-mysql.yml index 249e1f35..2cd0413f 100644 --- a/test-envs/docker-compose-2.5-mysql.yml +++ b/test-envs/docker-compose-3.0-mysql.yml @@ -10,7 +10,7 @@ services: web: build: context: .. - dockerfile: Dockerfile-2.5 + dockerfile: Dockerfile-3.0 environment: # These are set in script/ci-build, so we need to pass-thru them. RAILS_ENV: $RAILS_ENV diff --git a/test-envs/docker-compose-3.0-postgres.yml b/test-envs/docker-compose-3.0-postgres.yml new file mode 100644 index 00000000..0c6d9b03 --- /dev/null +++ b/test-envs/docker-compose-3.0-postgres.yml @@ -0,0 +1,32 @@ +version: '3' +services: + db: + image: postgres:13 + environment: + POSTGRES_DB: ${DATABASE_NAME:-tracks} + POSTGRES_PASSWORD: password + volumes: + - db-data:/var/lib/postgresql/data + web: + build: + context: .. + dockerfile: Dockerfile-3.0 + environment: + # These are set in script/ci-build, so we need to pass-thru them. + RAILS_ENV: $RAILS_ENV + DATABASE_NAME: $DATABASE_NAME + DATABASE_USERNAME: postgres + DATABASE_PASSWORD: password + DATABASE_TYPE: postgresql + DATABASE_ENCODING: unicode + DATABASE_PORT: 5432 + volumes: + - ${VOLUME:-..}:/app:Z + - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z + - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z + ports: + - 3000:3000 + depends_on: + - db +volumes: + db-data: diff --git a/test-envs/docker-compose-3.0-sqlite.yml b/test-envs/docker-compose-3.0-sqlite.yml new file mode 100644 index 00000000..ba4d3709 --- /dev/null +++ b/test-envs/docker-compose-3.0-sqlite.yml @@ -0,0 +1,17 @@ +version: '3' +services: + web: + build: + context: .. + dockerfile: Dockerfile-3.0 + environment: + # These are set in script/ci-build, so we need to pass-thru them. + RAILS_ENV: $RAILS_ENV + DATABASE_NAME: "/app/db.sqlite" + DATABASE_TYPE: sqlite3 + volumes: + - ${VOLUME:-..}:/app:Z + - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z + - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z + ports: + - 3000:3000 From 01e09f87083b3a5cb75e2a1347cc405c53abfd5f Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 3 Jan 2022 21:21:05 +0200 Subject: [PATCH 394/767] Ruby 3 compatibility fixes --- app/helpers/rendering_helper.rb | 2 +- app/models/message_gateway.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/rendering_helper.rb b/app/helpers/rendering_helper.rb index ad406aa6..60c6b3c6 100644 --- a/app/helpers/rendering_helper.rb +++ b/app/helpers/rendering_helper.rb @@ -13,7 +13,7 @@ module RenderingHelper # do not change string; URL is already linked href else - content_tag(:a, h(href), :href => URI.escape(href)) + content_tag(:a, h(href), :href => href) end end end diff --git a/app/models/message_gateway.rb b/app/models/message_gateway.rb index 711e6a92..2a125cd7 100644 --- a/app/models/message_gateway.rb +++ b/app/models/message_gateway.rb @@ -26,7 +26,7 @@ class MessageGateway < ActionMailer::Base attachment = todo.attachments.build # create temp file - tmp = Tempfile.new(['attachment', '.eml'], { universal_newline: true }) + tmp = Tempfile.new(['attachment', '.eml'], universal_newline: true) tmp.write email.raw_source.gsub(/\r/, "") # add temp file to attachment. paperclip will copy the file to the right location From 92c524024a6099952c8136d1453c9ad429aa19d6 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 3 Jan 2022 21:52:46 +0200 Subject: [PATCH 395/767] Remove Paperclip in favor of a fork due to Ruby 3 incompatibility --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index bc32d458..4c21623c 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'aasm', '~> 5.2.0' gem 'acts_as_list' gem 'bcrypt', '~> 3.1.16' gem 'htmlentities' -gem 'paperclip' +gem "kt-paperclip", "~> 6.4", ">= 6.4.1" gem 'puma', '~> 5.5' gem 'rails_autolink' gem 'RedCloth' diff --git a/Gemfile.lock b/Gemfile.lock index 4174949a..f1d97d33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,6 +135,12 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) + kt-paperclip (6.4.1) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) + mime-types + mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) libv8 (3.16.14.19) listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -146,9 +152,9 @@ GEM mini_mime (>= 0.1.1) marcel (1.0.2) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) + mime-types-data (3.2021.1115) mimemagic (0.3.10) nokogiri (~> 1) rake @@ -162,12 +168,6 @@ GEM nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - paperclip (6.1.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) - mime-types - mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) parallel (1.21.0) parser (3.1.0.0) ast (~> 2.4.1) @@ -336,11 +336,11 @@ DEPENDENCIES i18n-tasks (~> 0.9.37) jquery-rails (~> 4.4) jquery-ui-rails (~> 6.0.1) + kt-paperclip (~> 6.4, >= 6.4.1) listen minitest-stub-const mocha mysql2 (~> 0.5.3) - paperclip pg (~> 1.2.3) puma (~> 5.5) rack-mini-profiler From a020beab9e3b1f75af919f5b37762d913a2b633c Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Mon, 3 Jan 2022 22:12:45 +0200 Subject: [PATCH 396/767] More Ruby 3 compatibility fixes --- app/views/integrations/rest_api.html.erb | 52 ++++++++++++------------ test/helpers/rendering_helper_test.rb | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/views/integrations/rest_api.html.erb b/app/views/integrations/rest_api.html.erb index abf9a758..3d867146 100644 --- a/app/views/integrations/rest_api.html.erb +++ b/app/views/integrations/rest_api.html.erb @@ -64,10 +64,10 @@
  • /projects/<%= t('rest_help.id') %>/todos.xml
    • -

    <%= raw t('rest_help.retrieve.limit', { +

    <%= raw t('rest_help.retrieve.limit', fields: 'ID, created_at, modified_at, completed_at', limit_parameter: 'limit_fields', - set_to: 'index'}) %>

    + set_to: 'index') %>

     
@@ -87,10 +87,10 @@
 
 
    <%= t('rest_help.writing.title') %>
    
 
-
    <%= raw t('rest_help.writing.description', {
+
    <%= raw t('rest_help.writing.description',
   put: 'PUT',
   post: 'POST',
-  delete: 'DELETE'}) %>
    
+  delete: 'DELETE') %>
    
 
 
    <%= t('rest_help.writing.example_title') %>
    
 
@@ -105,9 +105,9 @@ Location: <%= root_url %>projects/65.xml
    -

    <%= raw t('rest_help.writing.example_project_response_title', { +

    <%= raw t('rest_help.writing.example_project_response_title', response_code: 'HTTP/1.1 201 Created', - header: 'Location'}) %>

    + header: 'Location') %>

     
@@ -120,9 +120,9 @@ Location: <%= root_url %>todos/452.xml
    -

    <%= raw t('rest_help.writing.example_todo_response_title', { +

    <%= raw t('rest_help.writing.example_todo_response_title', response_code: 'HTTP/1.1 201 Created', - header: 'Location'}) %>

    + header: 'Location') %>

     
@@ -143,8 +143,8 @@ Location: <%= root_url %>todos/452.xml
    -

    <%= raw t('rest_help.writing.example_note_response_title', { - response_code: 'HTTP/1.1 200 OK'}) %>

    +

    <%= raw t('rest_help.writing.example_note_response_title', + response_code: 'HTTP/1.1 200 OK') %>

     
@@ -164,8 +164,8 @@ Location: <%= root_url %>todos/452.xml
    -

    <%= raw t('rest_help.writing.example_delete_title', { - delete: 'DELETE'}) %>

    +

    <%= raw t('rest_help.writing.example_delete_title', + delete: 'DELETE') %>

     
@@ -176,15 +176,15 @@ Location: <%= root_url %>todos/452.xml
    -

    <%= raw t('rest_help.writing.example_delete_response_title', { - response_code: 'HTTP/1.1 200 OK'}) %>

    +

    <%= raw t('rest_help.writing.example_delete_response_title', + response_code: 'HTTP/1.1 200 OK') %>

    <%= t('rest_help.response.title') %>

    -

    <%= raw t('rest_help.response.description', { +

    <%= raw t('rest_help.response.description', response_200: '200 OK', response_201: '201 Created', - example_call: 'GET /contexts/2/todos.xml'}) %>

    + example_call: 'GET /contexts/2/todos.xml') %>

    <%= t('rest_help.response.xml_description') %>

    @@ -200,11 +200,11 @@ $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \

    <%= t('rest_help.activeresource.title') %>

    -

    <%= raw I18n.t 'rest_help.activeresource.description', { +

    <%= raw I18n.t 'rest_help.activeresource.description', activeresource_link: link_to(I18n.t('rest_help.activeresource.activeresource_link_text'), 'http://weblog.rubyonrails.org/2007/9/30/rails-2-0-0-preview-release'), ror_link: link_to(I18n.t('rest_help.activeresource.ror_link_text'), 'http://www.rubyonrails.org'), gem_command: 'gem install activeresource --source http://gems.rubyonrails.org --include-dependencies' -} %>

    +%>

     
@@ -226,8 +226,8 @@ Loading development environment (Rails 1.2.4)
    -

    <%= raw I18n.t 'rest_help.activeresource.wrapper_description', { - signals_link: link_to(I18n.t('rest_help.activeresource.signals_link_text'), 'http://www.37signals.com')} %>

    +

    <%= raw I18n.t 'rest_help.activeresource.wrapper_description', + signals_link: link_to(I18n.t('rest_help.activeresource.signals_link_text'), 'http://www.37signals.com') %>

     
@@ -246,13 +246,13 @@ irb(main):003:0>
 
    <%= t('rest_help.notes.description') %>
    
 
 
      
-  
    • <%= raw I18n.t 'rest_help.notes.bullet1', {
+  
    • <%= raw I18n.t 'rest_help.notes.bullet1',
     id: 'ID',
-    url: 'URL'} %>
      • 
-  
    • <%= raw I18n.t 'rest_help.notes.bullet2', {
-    omit: '...' } %>
      • 
+    url: 'URL' %>
+  
    • <%= raw I18n.t 'rest_help.notes.bullet2',
+    omit: '...' %>
      • 
 
    
 
-
    <%= raw I18n.t 'rest_help.notes.curl_description', {
-  curl: link_to(I18n.t('rest_help.curl_link_text'), 'http://en.wikipedia.org/wiki/CURL')} %>
    
+
    <%= raw I18n.t 'rest_help.notes.curl_description',
+  curl: link_to(I18n.t('rest_help.curl_link_text'), 'http://en.wikipedia.org/wiki/CURL') %>
    
 
diff --git a/test/helpers/rendering_helper_test.rb b/test/helpers/rendering_helper_test.rb
index 8aae34e9..14740710 100644
--- a/test/helpers/rendering_helper_test.rb
+++ b/test/helpers/rendering_helper_test.rb
@@ -28,7 +28,7 @@ class RenderingHelperTest < ActionView::TestCase
   end
 
   test "message link" do
-    expected = '
    Call message://<123>.
    '
+    expected = '
    Call message://<123>.
    '
     actual = render_text("Call message://<123>.")
     assert_equal(expected, actual)
   end

From d1b4ee9e879fd4bbf5d70e62920bb0b4123e2ba4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 00:02:10 +0000
Subject: [PATCH 397/767] Bump kt-paperclip from 6.4.1 to 7.0.1

Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip) from 6.4.1 to 7.0.1.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases)
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS)
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v6.4.1...v7.0.1)

---
updated-dependencies:
- dependency-name: kt-paperclip
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c21623c..7b8b5dab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'aasm', '~> 5.2.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.16'
 gem 'htmlentities'
-gem "kt-paperclip", "~> 6.4", ">= 6.4.1"
+gem "kt-paperclip", "~> 7.0"
 gem 'puma', '~> 5.5'
 gem 'rails_autolink'
 gem 'RedCloth'
diff --git a/Gemfile.lock b/Gemfile.lock
index f1d97d33..ead9092e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,11 +135,11 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    kt-paperclip (6.4.1)
+    kt-paperclip (7.0.1)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
+      marcel (~> 1.0.1)
       mime-types
-      mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     libv8 (3.16.14.19)
     listen (3.7.0)
@@ -155,9 +155,6 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.1115)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.15.0)
@@ -336,7 +333,7 @@ DEPENDENCIES
   i18n-tasks (~> 0.9.37)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
-  kt-paperclip (~> 6.4, >= 6.4.1)
+  kt-paperclip (~> 7.0)
   listen
   minitest-stub-const
   mocha

From e165a561ae90913233b8249b56b2f8909c795699 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 4 Jan 2022 03:17:04 +0200
Subject: [PATCH 398/767] Bump the .ruby-version

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 95e3ba81..1effb003 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5
+2.7

From f99b423445580a611913f372114d74cc9329695a Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sat, 15 Jan 2022 10:59:56 +0200
Subject: [PATCH 399/767] Apparently Rubocop only works with up to 2.5, so
 let's use that then for it.

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 1effb003..95e3ba81 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7
+2.5

From 4b95fc4af7ebe08b0a17794c156152778a0684c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 15 Jan 2022 18:14:02 +0000
Subject: [PATCH 400/767] Bump tolk from 4.1.0 to 4.1.1

Bumps [tolk](https://github.com/tolk/tolk) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/tolk/tolk/releases)
- [Changelog](https://github.com/tolk/tolk/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tolk/tolk/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: tolk
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7b8b5dab..98e8e2fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@ group :development do
   gem 'spring'
   gem 'yard'
 
-  gem 'tolk', '~> 4.1.0'
+  gem 'tolk', '~> 4.1.1'
 
   gem 'bullet'
   gem 'rack-mini-profiler'
diff --git a/Gemfile.lock b/Gemfile.lock
index ead9092e..7b25066b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.15.3)
+    ffi (1.15.5)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
     globalid (1.0.0)
@@ -156,14 +156,14 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.1115)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.7.1)
     minitest (5.15.0)
     minitest-stub-const (0.6)
     mocha (1.13.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     parallel (1.21.0)
     parser (3.1.0.0)
@@ -287,13 +287,14 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tolk (4.1.0)
+    tolk (4.1.1)
       rails (>= 5.0)
       safe_yaml (>= 0.8.6)
       sassc
+      sprockets-rails (~> 3.4)
     tracks-chartjs-ror (3.6.4)
       rails (>= 3.1)
     tzinfo (1.2.9)
@@ -354,7 +355,7 @@ DEPENDENCIES
   spring
   sqlite3
   therubyracer
-  tolk (~> 4.1.0)
+  tolk (~> 4.1.1)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)
   will_paginate

From c660f275e0a15136749a530fb3960a2741824f5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 15 Jan 2022 18:14:16 +0000
Subject: [PATCH 401/767] Bump listen from 3.7.0 to 3.7.1

Bumps [listen](https://github.com/guard/listen) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.7.0...v3.7.1)

---
updated-dependencies:
- dependency-name: listen
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ead9092e..de58da68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.15.3)
+    ffi (1.15.5)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
     globalid (1.0.0)
@@ -142,7 +142,7 @@ GEM
       mime-types
       terrapin (~> 0.6.0)
     libv8 (3.16.14.19)
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.13.0)

From 771c24154d6a8a090f211548791bf1dc6291b029 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jan 2022 00:09:20 +0000
Subject: [PATCH 402/767] Bump bullet from 7.0.0 to 7.0.1

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.0...7.0.1)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 215b3457..53ba8b58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.0.0)
+    bullet (7.0.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)

From 279cfffeb0d382fdf8a691eac71c41c907debd76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jan 2022 00:09:54 +0000
Subject: [PATCH 403/767] Bump rspec-expectations from 3.10.1 to 3.10.2

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.10.1...v3.10.2)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 215b3457..1a1526a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     database_cleaner (1.8.5)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.3.4)
     e2mmap (0.1.0)
     erubi (1.10.0)
@@ -222,10 +222,10 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.3)
     rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)

From 57dd37ada3b87e13b186ee59b54b9be714813ce3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jan 2022 00:02:39 +0000
Subject: [PATCH 404/767] Bump rubocop from 1.24.1 to 1.25.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.24.1 to 1.25.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.24.1...v1.25.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 98e8e2fb..f3999cd2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.24', require: false
+  gem 'rubocop', '~> 1.25', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 96351388..6b631d37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,7 +212,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
@@ -226,9 +226,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.24.1)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
@@ -347,7 +347,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.24)
+  rubocop (~> 1.25)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From c22ce009510aa1a3f1c81d63a20252e587eb3644 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jan 2022 00:06:00 +0000
Subject: [PATCH 405/767] Bump solargraph from 0.44.2 to 0.44.3

Bumps [solargraph](https://github.com/castwide/solargraph) from 0.44.2 to 0.44.3.
- [Release notes](https://github.com/castwide/solargraph/releases)
- [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md)
- [Commits](https://github.com/castwide/solargraph/compare/v0.44.2...v0.44.3)

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 96351388..c5d53e5e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,7 +212,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
@@ -256,7 +256,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
-    solargraph (0.44.2)
+    solargraph (0.44.3)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)

From 86e14120a20d6fb475fbce59e5f7a12feb69a0c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jan 2022 00:02:13 +0000
Subject: [PATCH 406/767] Bump puma from 5.5.2 to 5.6.1

Bumps [puma](https://github.com/puma/puma) from 5.5.2 to 5.6.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.5.2...v5.6.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index f3999cd2..d1fdbb7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.16'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.0"
-gem 'puma', '~> 5.5'
+gem 'puma', '~> 5.6'
 gem 'rails_autolink'
 gem 'RedCloth'
 gem 'sanitize', '~> 6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 63420825..546f8f1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -169,7 +169,7 @@ GEM
     parser (3.1.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
-    puma (5.5.2)
+    puma (5.6.1)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
@@ -340,7 +340,7 @@ DEPENDENCIES
   mocha
   mysql2 (~> 0.5.3)
   pg (~> 1.2.3)
-  puma (~> 5.5)
+  puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)
   rails-controller-testing

From a37817a90b5e28509c71f54c0d9da36d9c98f61c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jan 2022 09:44:10 +0000
Subject: [PATCH 407/767] Bump pg from 1.2.3 to 1.3.0

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.3 to 1.3.0.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.3...v1.3.0)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d1fdbb7e..70acd47e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.3', group: :mysql
-gem 'pg', '~> 1.2.3', group: :postgresql
+gem 'pg', '~> 1.3.0', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 546f8f1c..77e80383 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.3.0)
     puma (5.6.1)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -339,7 +339,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.3)
-  pg (~> 1.2.3)
+  pg (~> 1.3.0)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From a6d70a05a1a8f830fb2b2de47428613fdc65e235 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 31 Jan 2022 12:06:47 +0200
Subject: [PATCH 408/767] Add Obsidian support to the link sanitation

---
 app/helpers/rendering_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/rendering_helper.rb b/app/helpers/rendering_helper.rb
index 60c6b3c6..956e93d9 100644
--- a/app/helpers/rendering_helper.rb
+++ b/app/helpers/rendering_helper.rb
@@ -27,7 +27,7 @@ module RenderingHelper
     config = relaxed_config
 
     # add onenote and message protocols, allow a target
-    a_href_config = relaxed_config[:protocols]['a']['href'] + %w(onenote message)
+    a_href_config = relaxed_config[:protocols]['a']['href'] + %w[onenote message obsidian]
     a_attributes = relaxed_config[:attributes]['a'] + ['target']
     config = Sanitize::Config.merge(config, protocols: { 'a' => { 'href' => a_href_config } }, :attributes => { 'a' => a_attributes })
 

From 9e09972d031af0c131d953343c4c623cf5657a4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Feb 2022 00:02:33 +0000
Subject: [PATCH 409/767] Bump pg from 1.3.0 to 1.3.1

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.0...v1.3.1)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 70acd47e..bd3019de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.3', group: :mysql
-gem 'pg', '~> 1.3.0', group: :postgresql
+gem 'pg', '~> 1.3.1', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 77e80383..1c0a86c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
-    pg (1.3.0)
+    pg (1.3.1)
     puma (5.6.1)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -339,7 +339,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.3)
-  pg (~> 1.3.0)
+  pg (~> 1.3.1)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 7a9dd6cd6fe3ffca942b08a6838cbf3001b847fc Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 3 Feb 2022 11:44:26 +0200
Subject: [PATCH 410/767] Add the obsidian link support to config also. Fix
 poll-for-db.

---
 Dockerfile                       | 2 +-
 config/initializers/sanitizer.rb | 2 +-
 script/poll-for-db               | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index db32b135..6faeffe5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN bundle install --jobs 4
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn
+RUN apt-get update && apt-get install -y yarn netcat
 
 RUN mkdir /app/log
 
diff --git a/config/initializers/sanitizer.rb b/config/initializers/sanitizer.rb
index 46ca6ebd..7f6a5e32 100644
--- a/config/initializers/sanitizer.rb
+++ b/config/initializers/sanitizer.rb
@@ -7,4 +7,4 @@ safe_list =
     Loofah::HTML5::WhiteList
   end
 
-safe_list::ALLOWED_PROTOCOLS.merge(%w(message onenote))
+safe_list::ALLOWED_PROTOCOLS.merge(%w(message onenote obsidian))
diff --git a/script/poll-for-db b/script/poll-for-db
index f6877f34..05b1db4b 100755
--- a/script/poll-for-db
+++ b/script/poll-for-db
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+echo "==> Polling DB…"
+
 appdir=$(cd $(dirname "$0")/.. && pwd)
 [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@
 
 for i in {1..60}; do
-  curl -sf telnet://db:3306 >/dev/null && exit
+  nc -z -w5 db 3306 && exit
   sleep 1
 done
 

From a58b0c77b0c815e6325b72158398684c66dea667 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Feb 2022 00:02:07 +0000
Subject: [PATCH 411/767] Bump rubocop from 1.25.0 to 1.25.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.25.0 to 1.25.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.25.0...v1.25.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 77e80383..5121835a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -226,7 +226,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.25.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)

From 5eddac7731e8aac7033079cff8de61bd4abf1cd0 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Fri, 7 Jan 2022 12:41:46 +0000
Subject: [PATCH 412/767] Translated using Weblate (English)

Currently translated at 99.0% (1105 of 1116 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/en/
---
 config/locales/en.yml | 114 +++++++++++++++++++++++++++---------------
 1 file changed, 73 insertions(+), 41 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 47df204d..38e489d4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -96,9 +96,8 @@ en:
     action: Action
     actions: Actions
     actions_midsentence:
-      one: action
-      other: actions
-      zero: actions
+      one: actions
+      other: action
     add: Add
     ajaxError: There was an error retrieving from server
     back: Back
@@ -110,9 +109,8 @@ en:
     contribute: Contribute
     create: Create
     days_midsentence:
-      one: day
-      other: days
-      zero: days
+      one: days
+      other: day
     deferred: deferred
     description: Description
     drag_handle: DRAG
@@ -131,9 +129,8 @@ en:
     none: None
     not_available_abbr: n/a
     note:
-      one: 1 notes
-      other: "%{count} notes"
-      zero: no notes
+      one: no notes
+      other: 1 notes
     notes: Notes
     numbered_step: Step %{number}
     ok: Ok
@@ -320,13 +317,11 @@ en:
         other: almost %{count} years
       half_a_minute: half a minute
       less_than_x_minutes:
-        one: less than a minute
-        other: less than %{count} minutes
-        zero: less than 1 minute
+        one: less than 1 minute
+        other: less than a minute
       less_than_x_seconds:
         one: less than 1 second
-        other: less than %{count} seconds
-        zero: less than 1 second
+        other: less than 1 second
       over_x_years:
         one: over 1 year
         other: over %{count} years
@@ -1325,13 +1320,11 @@ en:
       multi_page_html: Displaying %{model} %{from} - %{to} of %{count}
         in total
       single_page:
-        one: Displaying 1 %{model}
-        other: Displaying all %{count} %{model}
-        zero: No %{model} found
+        one: No %{model} found
+        other: Displaying 1 %{model}
       single_page_html:
-        one: Displaying 1 %{model}
-        other: Displaying all %{count} %{model}
-        zero: No %{model} found
+        one: No %{model} found
+        other: Displaying 1 %{model}
     page_gap: "…"
     previous_label: "← Previous"
   auth_type:
@@ -1342,49 +1335,88 @@ en:
     curl_link_text: cURL
     intro:
       title: Introduction
-      content: Tracks is designed to be integrated with scripts, web services, and third-party applications. This page serves as the documentation of our REST API.
-      content_2: The Tracks REST API allows developers to integrate Tracks into their applications. It allows applications to access and modify Tracks data, and is implemented as Vanilla XML over HTTP.
-      content_3: The API is a %{restful_link} service. All data is available through the API as a resource to which can be referred using a unique identifier. It responds to a number of the HTTP methods, specifically GET, PUT, POST and UPDATE, and all responses from the API are in a simple XML format encoded as UTF-8.
+      content: Tracks is designed to be integrated with scripts, web services, and
+        third-party applications. This page serves as the documentation of our REST
+        API.
+      content_2: The Tracks REST API allows developers to integrate Tracks into their
+        applications. It allows applications to access and modify Tracks data, and
+        is implemented as Vanilla XML over HTTP.
+      content_3: The API is a %{restful_link} service. All data is available through
+        the API as a resource to which can be referred using a unique identifier.
+        It responds to a number of the HTTP methods, specifically GET, PUT, POST and
+        UPDATE, and all responses from the API are in a simple XML format encoded
+        as UTF-8.
       restful_link_text: RESTful
     auth:
       title: Authentication
-      content: Authentication is handled using %{auth_link}. Your Tracks username and password is used as the authentication credentials for the API. Note that in Basic HTTP authentication, your password is sent in clear text. If you need a more secure authentication solution, you should configure your web server to run Tracks under HTTPS.
+      content: Authentication is handled using %{auth_link}. Your Tracks username
+        and password is used as the authentication credentials for the API. Note that
+        in Basic HTTP authentication, your password is sent in clear text. If you
+        need a more secure authentication solution, you should configure your web
+        server to run Tracks under HTTPS.
       basic_auth_link_text: Basic HTTP authentication
     retrieve:
       title: Retrieving data from the API
-      content: 'To retrieve data you only need to do an HTTP GET on a resource identifier. For example, if you want to get all the contexts with %{curl_link}:'
+      content: 'To retrieve data you only need to do an HTTP GET on a resource identifier.
+        For example, if you want to get all the contexts with %{curl_link}:'
       single_context: 'Getting a single context:'
       todos_from_context: 'Getting the todos within a context:'
-      projects: You also can apply the pattern shown above with projects instead of contexts.
+      projects: You also can apply the pattern shown above with projects instead of
+        contexts.
       paths_title: 'All data is available according to the following resource paths:'
-      limit: 'For the todo resources (todos, tickler, done, hidden and calendar) you can limit the returnedfield to %{fields} by adding the parameter %{limit_parameter} and setting it to %{set_to}. For example:'
-      active_todos: 'If you only want to get the active todos, you add the parameter %{active_code} and set it to some value like this:'
+      limit: 'For the todo resources (todos, tickler, done, hidden and calendar) you
+        can limit the returnedfield to %{fields} by adding the parameter %{limit_parameter}
+        and setting it to %{set_to}. For example:'
+      active_todos: 'If you only want to get the active todos, you add the parameter
+        %{active_code} and set it to some value like this:'
     writing:
       title: Writing to the API
-      description: The API provides mechanisms for adding, updating and deleting resources using the HTTP methods %{put}, %{post} and %{delete} in combination with the content.
+      description: The API provides mechanisms for adding, updating and deleting resources
+        using the HTTP methods %{put}, %{post} and %{delete} in combination with the
+        content.
       example_title: 'Creating a new project, using curl:'
       example_project_name: Build a treehouse for the kids
-      example_project_response_title: 'The response is an %{response_code} with %{header} header indicating where the new project resource can be found. Now we can add a todo to this project, using curl:'
+      example_project_response_title: 'The response is an %{response_code} with %{header}
+        header indicating where the new project resource can be found. Now we can
+        add a todo to this project, using curl:'
       example_todo_name: Model treehouse in SketchUp
-      example_todo_response_title: 'The response is a again an %{response_code} with %{header} header indicating where the new todo resource can be found. Changing the todo notes, again using curl:'
+      example_todo_response_title: 'The response is a again an %{response_code} with
+        %{header} header indicating where the new todo resource can be found. Changing
+        the todo notes, again using curl:'
       example_note_text: use maple texture
-      example_note_response_title: 'The response is an %{response_code} with in the body the XML representation of the updated todo. We provide a shorcut method to toggle a todo done or undone without having to perform the update with the right field values:'
-      example_delete_title: 'If we want to delete that todo we can call its unique resource identifier (the URL) with the HTTP method %{delete}, again with curl:'
-      example_delete_response_title: The API returns an %{response_code} and the todo is now deleted.
+      example_note_response_title: 'The response is an %{response_code} with in the
+        body the XML representation of the updated todo. We provide a shorcut method
+        to toggle a todo done or undone without having to perform the update with
+        the right field values:'
+      example_delete_title: 'If we want to delete that todo we can call its unique
+        resource identifier (the URL) with the HTTP method %{delete}, again with curl:'
+      example_delete_response_title: The API returns an %{response_code} and the todo
+        is now deleted.
     response:
       title: Dealing with the response and response status
-      description: All successful operations respond with a status code of %{response_200} or %{response_201} depending on the operation. Sometimes a list, say %{example_call} will not have any items, it will return an empty list.
-      xml_description: 'The XML for empty list responses look like this, again with curl:'
+      description: All successful operations respond with a status code of %{response_200}
+        or %{response_201} depending on the operation. Sometimes a list, say %{example_call}
+        will not have any items, it will return an empty list.
+      xml_description: 'The XML for empty list responses look like this, again with
+        curl:'
     activeresource:
       title: Consuming the API with ActiveResource
-      description: '%{activeresource_link} is a thin but powerful wrapper around RESTful services exposed by %{ror_link}. It will be part of Rails 2.0 but until then you can get it with %{gem_command}.'
+      description: '%{activeresource_link} is a thin but powerful wrapper around RESTful
+        services exposed by %{ror_link}. It will be part of Rails 2.0 but until then
+        you can get it with %{gem_command}.'
       activeresource_link_text: ActiveResource
       ror_link_text: Ruby on Rails
-      wrapper_description: 'Inspired by %{signals_link}  ’s Highrise wrapper, we’ve put together a small ruby wrapper (find it in the doc/ directory) for the API which sets up the ActiveResource models for you to play with in an IRB session:'
+      wrapper_description: 'Inspired by %{signals_link}  ’s Highrise wrapper,
+        we’ve put together a small ruby wrapper (find it in the doc/ directory)
+        for the API which sets up the ActiveResource models for you to play with in
+        an IRB session:'
       signals_link_text: 37 Signals
     notes:
       title: Notes about the documentation
-      description: 'A few conventions have been applied in the documentation, these are:'
-      bullet1: '%{id}’s in a resource %{url} indicate that the resource’s unique ID needs to be inserted there'
-      bullet2: '%{omit} indicates that unimportant bits of response data have been removed to eliminate noise from the documentation'
+      description: 'A few conventions have been applied in the documentation, these
+        are:'
+      bullet1: '%{id}’s in a resource %{url} indicate that the resource’s
+        unique ID needs to be inserted there'
+      bullet2: '%{omit} indicates that unimportant bits of response data have been
+        removed to eliminate noise from the documentation'
       curl_description: 'All examples make use of %{curl}.'

From 1b8a6d732aeff65bc8e4580444928d2c45845af2 Mon Sep 17 00:00:00 2001
From: Francisco Serrador 
Date: Thu, 13 Jan 2022 19:26:42 +0000
Subject: [PATCH 413/767] Translated using Weblate (Spanish)

Currently translated at 88.2% (985 of 1116 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/es/
---
 config/locales/es.yml | 239 ++++++++++++++++++++++++++----------------
 1 file changed, 151 insertions(+), 88 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index d832b127..73996c78 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,4 +1,3 @@
----
 es:
   activerecord:
     attributes:
@@ -26,6 +25,8 @@ es:
         title_date_format: Título del formato de fecha
         verbose_action_descriptors: Descriptores detallado de acción
         week_starts: La semana comienza
+        theme: Tema
+        email: Correo-e
       project:
         default_context_name: Default contexto
         default_tags: Etiquetas estándar
@@ -49,6 +50,8 @@ es:
         login: Login
         open_id_url: OpenID URL
         password: Password
+        created_at: Creado en
+        last_login_at: Última presentación en
     errors:
       full_messages:
         format: "%{attribute} %{message}"
@@ -70,8 +73,10 @@ es:
         odd: tiene que ser impar
         record_invalid: 'Validation failed: %{errors}'
         restrict_dependent_destroy:
-          many: Невозможно удалить запись, так как есть %{record} зависящие от нее
           one: Невозможно удалить запись, так как есть %{record} зависящая от нее
+          other: Невозможно удалить запись, так как есть %{record} зависящие от нее
+          has_one: No se puede borrar la grabación porque existe un %{record} dependiente
+          has_many: No se puede borrar la grabación porque existe %{record} dependiente
         taken: Ya se ha dado
         too_long: es demasiado largo (el máximo es %{count} caracteres)
         too_short: es demasiado corto (mínimo %{count} caracteres)
@@ -87,14 +92,13 @@ 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
     actions_midsentence:
-      one: tarea
-      other: tareas
-      zero: tareas
+      one: tareas
+      other: tarea
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -106,9 +110,8 @@ es:
     contribute: Contribuir
     create: Crear
     days_midsentence:
-      one: día
-      other: días
-      zero: días
+      one: días
+      other: día
     deferred: pospuestas
     description: Descripción
     drag_handle: ARRASTRAR
@@ -127,9 +130,8 @@ es:
     none: Ninguno
     not_available_abbr: n/e
     note:
-      one: 1 nota
-      other: "%{count} notas"
-      zero: 0 notas
+      one: 0 notas
+      other: 1 nota
     notes: Notas
     numbered_step: Paso %{number}
     ok: Ok
@@ -145,11 +147,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
@@ -160,14 +164,18 @@ es:
     wiki: Wiki
   contexts:
     add_context: Añadir contexto
-    all_completed_tasks_title: 'TRACKS:: Todas las acciones completadas en ''%{context_name}'' contexto'
-    completed_tasks_title: 'TRACKS:: Las acciones completadas en ''%{context_name}'' el contexto'
+    all_completed_tasks_title: 'TRACKS:: Todas las acciones completadas en ''%{context_name}''
+      contexto'
+    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_name: Nombre del contexto
     context_state: Context state
     delete_context: Eliminar 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!"
+    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!"
     delete_context_title: Eliminar contexto
     edit_context: Editar contexto
     hidden_contexts: Contextos ocultos
@@ -197,7 +205,8 @@ es:
         some: Han ocurrido algunos errores durante la importación
         file_blank: File can't be blank
         invalid_csv: "Invalid CSV: could not read headers: %{e}"
-        save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write to the upload directory? %{e}"
+        save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write\
+          \ to the upload directory? %{e}"
       map_title: Map fields to be imported
       header: Importing data
       submit: Import
@@ -208,21 +217,30 @@ es:
       projects_count: "%{count} Projects imported"
       todos_count: "%{count} Todos imported"
       yaml_disabled: "YAML loading is disabled"
-      yaml_warning: "%{warning}: all your current data will be destroyed before importing the YAML file, so if you have access to the database, we strongly recommend backing up the database right now in case that anything goes wrong."
-      paste_field: "Paste the contents of the YAML file you exported into the text box below:"
+      yaml_warning: "%{warning}: all your current data will be destroyed before importing\
+        \ the YAML file, so if you have access to the database, we strongly recommend\
+        \ backing up the database right now in case that anything goes wrong."
+      paste_field: "Paste the contents of the YAML file you exported into the text\
+        \ box below:"
       warning: Beware
     export:
       page_title: Tracks::Export
       title: Exportar datos
       format_header: "Puede escoger entre los siguientes formatos:"
       yaml_description: "%{yaml}: Mejor formato para exportar datos."
-      yaml_link_description: Fichero YAML con todas sus acciones, contextos, proyectos, etiquetas y notas
-      yaml_experimental: "Por favor tenga en cuenta que la importación de ficheros YAML actualmente esta soportada de forma experimental. No confíe en este formato para hacer copias de seguridad de datos importantes."
-      csv_description: "%{csv}: Mejor formato para importar en una hoja de cálculo o en programas de análisis de datos."
-      csv_actions_description: Fichero CSV con todas sus acciones, con contextos por nombre y proyectos
+      yaml_link_description: Fichero YAML con todas sus acciones, contextos, proyectos,
+        etiquetas y notas
+      yaml_experimental: "Por favor tenga en cuenta que la importación de ficheros\
+        \ YAML actualmente esta soportada de forma experimental. No confíe en este\
+        \ formato para hacer copias de seguridad de datos importantes."
+      csv_description: "%{csv}: Mejor formato para importar en una hoja de cálculo\
+        \ o en programas de análisis de datos."
+      csv_actions_description: Fichero CSV con todas sus acciones, con contextos por
+        nombre y proyectos
       csv_notes_description: Fichero CSV con todas sus notas
       xml_description: "%{xml}: Mejor formato para transformar los datos a otro formato"
-      xml_link_description: Fichero XML con todas sus acciones, contextos, proyectos, etiquetas y notas
+      xml_link_description: Fichero XML con todas sus acciones, contextos, proyectos,
+        etiquetas y notas
       download_link: Enlace de descarga
       yaml_link_title: Fichero YAML
       csv_actions_title: Fichero CSV (acciones, contextos y proyectos)
@@ -300,28 +318,26 @@ es:
         other: Casi %{count} años
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de un minuto
-        other: menos de %{count} minutos
-        zero: menos de 1 minuto
+        one: menos de 1 minuto
+        other: menos de un minuto
       less_than_x_seconds:
         one: menos de 1 segundo
-        other: menos de %{count} segundos
-        zero: menos de 1 segundo
+        other: menos de 1 segundo
       over_x_years:
         one: más de 1 año
         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
@@ -354,7 +370,8 @@ es:
       too_long: 'слишком длинное (максимум: %{count} символов)'
       too_short: 'слишком кроткое (минимум: %{count} символов)'
       wrong_length: неверной длины (должно быть %{count} символов)
-    user_unauthorized: '401 No autorizado: Solo los usuarios administrativos pueden acceder a esta función.'
+    user_unauthorized: '401 No autorizado: Solo los usuarios administrativos pueden
+      acceder a esta función.'
   feedlist:
     actions_completed_last_week: Tareas completadas en los últimos 7 días
     actions_due_next_week: Tareas pendientes en 7 días o menos
@@ -367,14 +384,17 @@ es:
     choose_context: Elija el contexto en el que desea un canal de
     choose_project: Elegir el proyecto que quiere un canal de
     context_centric_actions: Feeds de acciones incompletas en un contexto específico
-    context_needed: Es necesario que haya al menos un contexto antes de poder solicitar un feed
+    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/s %{number} accion/es
     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.'
+    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.'
     plain_text_feed: Canal Texto sin formato
     project_centric: Feeds de acciones incompletas en un proyecto específico
-    project_needed: Es necesario que haya al menos un proyecto antes de poder solicitar un feed
+    project_needed: Es necesario que haya al menos un proyecto antes de poder solicitar
+      un feed
     projects_and_actions: Proyectos activos con sus acciones
     rss_feed: RSS Feed
     select_feed_for_context: Seleccione la alimentación de este contexto
@@ -392,11 +412,14 @@ es:
     opensearch_description: Buscar en las Tracks
   help:
     title: Help
-    usage: 'You can find information on the usage in the %{manual_link} in the project GitHub wiki.'
+    usage: 'You can find information on the usage in the %{manual_link} in the project
+      GitHub wiki.'
     manual_link_text: User manual
-    bugs: 'If you encounter a bug or have a feature request, please report it in the %{issue_link}.'
+    bugs: 'If you encounter a bug or have a feature request, please report it in the
+      %{issue_link}.'
     issue_link_text: issue queue
-    contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} for further information. You can also come discuss with the community:'
+    contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link}
+      for further information. You can also come discuss with the community:'
     contribute_link_text: project website
     mailing_list_link_text: Mailing list
     irc_bullet: '%{irc_link} (also available in %{matrix_link})'
@@ -506,8 +529,10 @@ es:
     todo:
       error_date_must_be_future: must be a date in the future
     user:
-      error_context_not_associated: Context id %{context} not associated with user id %{user}.
-      error_project_not_associated: Project id %{project} not associated with user id %{user}.
+      error_context_not_associated: Context id %{context} not associated with user
+        id %{user}.
+      error_project_not_associated: Project id %{project} not associated with user
+        id %{user}.
   notes:
     delete_confirmation: Are you sure that you want to delete the note '%{id}'?
     delete_item_title: Delete item
@@ -516,7 +541,8 @@ es:
     deleted_note: Deleted note '%{id}'
     edit_item_title: Edit item
     in_project: 'En:'
-    no_notes_available: 'Currently there are no notes: add notes to projects from individual project pages.'
+    no_notes_available: 'Currently there are no notes: add notes to projects from
+      individual project pages.'
     note_header: Note %{id}
     note_link_title: Show note %{id}
     note_location_link: 'In:'
@@ -578,14 +604,17 @@ es:
     current_authentication_type: Your authentication type is %{auth_type}
     edit_preferences: Edit preferences
     generate_new_token: Generate a new token
-    generate_new_token_confirm: Are you sure? Generating a new token will replace the existing one and break any external usages of this token.
+    generate_new_token_confirm: Are you sure? Generating a new token will replace
+      the existing one and break any external usages of this token.
     is_false: 'false'
     is_true: 'true'
     open_id_url: Your OpenID URL is
     page_title: TRACKS::Preferences
     page_title_edit: TRACKS::Edit Preferences
     password_changed: Que ha cambiado la contraseña, por favor vuelve a iniciar sesión.
-    remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out.
+    remove_introduction: You can remove your user account here. Note that this is
+      irreversible and will remove all your data! After removal you will be logged
+      out.
     show_number_completed: Show %{number} completed items
     sms_context_none: None
     staleness_starts_after: Staleness starts after %{days} days
@@ -605,11 +634,13 @@ es:
     add_note: Añadir una nota
     add_note_submit: Añadir nota
     add_project: Añadir Proyecto
-    all_completed_tasks_title: 'TRACKS:: Lista de todas las acciones terminado en ''%{project_name}'' Proyecto'
+    all_completed_tasks_title: 'TRACKS:: Lista de todas las acciones terminado en
+      ''%{project_name}'' Proyecto'
     completed_actions: Completed actions
     completed_actions_empty: Completed actions empty
     completed_projects: Proyectos completados
-    completed_tasks_title: 'TRACKS:: Lista de Acciones completadas en ''%{project_name}'' Proyecto'
+    completed_tasks_title: 'TRACKS:: Lista de Acciones completadas en ''%{project_name}''
+      Proyecto'
     default_context: El contexto por defecto para este proyecto es %{context}
     default_context_removed: Eliminado el contexto por defecto
     default_context_set: Set project's default context to %{default_context}
@@ -617,7 +648,8 @@ es:
     deferred_actions: Deferred actions
     deferred_actions_empty: Deferred actions empty
     delete_project: Delete project
-    delete_project_confirmation: Are you sure that you want to delete the project '%{name}'?
+    delete_project_confirmation: Are you sure that you want to delete the project
+      '%{name}'?
     delete_project_title: Delete the project
     edit_project_settings: Edit Project Settings
     edit_project_title: Editar proyecto
@@ -632,7 +664,8 @@ es:
     list_reviews: TRACKS::Revisión
     no_default_context: Este proyecto no tiene un contexto por defecto
     no_last_completed_projects: No hay proyectos terminados encontrado
-    no_last_completed_recurring_todos: No se ha completado las acciones repetitivas que se encuentran
+    no_last_completed_recurring_todos: No se ha completado las acciones repetitivas
+      que se encuentran
     no_notes_attached: Actualmente no hay notas adjuntas a este proyectos
     no_projects: Currently there are no projects
     notes: Notes
@@ -725,10 +758,13 @@ es:
     action_selection_title: TRACKS::Selección de Acción
     actions: Acciones
     actions_30days_title: Acciones en los últimos 30 días
-    actions_actions_avg_created_30days: In the last 30 days you created on average %{count} actions
+    actions_actions_avg_created_30days: In the last 30 days you created on average
+      %{count} actions
     actions_avg_completed: and completed an average of %{count} actions per month.
-    actions_avg_completed_30days: and completed an average of %{count} actions per day.
-    actions_avg_completion_time: Of all your completed actions, the average time to complete is %{count} days.
+    actions_avg_completed_30days: and completed an average of %{count} actions per
+      day.
+    actions_avg_completion_time: Of all your completed actions, the average time to
+      complete is %{count} days.
     actions_avg_created: In the last 12 months you created on average %{count} actions
     actions_day_of_week_legend:
       day_of_week: Día de la semana
@@ -749,10 +785,12 @@ es:
     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} and further.
+    click_to_show_actions_from_week: Click %{link} to show the actions from week %{week}
+      and further.
     click_to_update_actions: Click on a bar in the chart to update the actions below.
     contexts: Contexts
-    current_running_time_of_incomplete_visible_actions: Current running time of incomplete visible actions
+    current_running_time_of_incomplete_visible_actions: Current running time of incomplete
+      visible actions
     index_title: TRACKS::Estadística
     labels:
       avg_completed: Avg completed
@@ -769,7 +807,8 @@ es:
       number_of_days: Number of days ago
       percentage: Percentage
       running_time: Running time of an action (weeks)
-    more_stats_will_appear: More statistics will appear here once you have added some actions.
+    more_stats_will_appear: More statistics will appear here once you have added some
+      actions.
     no_actions_selected: No hay tareas seleccionadas.
     no_tags_available: no tags available
     open_per_week: Próximas acciones activas (visibles y ocultas) a la semana
@@ -788,10 +827,13 @@ es:
       percentage: Percentage
       weeks: Running time of an action (weeks). Click on a bar for more info
     spread_of_actions_for_all_context: Spread of actions for all context
-    spread_of_running_actions_for_visible_contexts: Spread of running actions for visible contexts
-    tag_cloud_90days_description: This tag cloud includes tags of actions that were created or completed in the past 90 days.
+    spread_of_running_actions_for_visible_contexts: Spread of running actions for
+      visible contexts
+    tag_cloud_90days_description: This tag cloud includes tags of actions that were
+      created or completed in the past 90 days.
     tag_cloud_90days_title: Tag cloud actions in past 90 days
-    tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden)
+    tag_cloud_description: This tag cloud includes tags of all actions (completed,
+      not completed, visible and/or hidden)
     tag_cloud_title: Tag cloud for all actions
     tags: Tags
     time_of_day: Time of day (all actions)
@@ -806,7 +848,8 @@ es:
     top10_projects: Top 10 projects
     top10_projects_30days: Top 10 project in past 30 days
     top5_contexts: Top 5 contexts
-    top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete actions
+    top5_visible_contexts_with_incomplete_actions: Top 5 visible contexts with incomplete
+      actions
     totals: Totals
     totals_action_count: you have a total of %{count} actions
     totals_actions_completed: "%{count} of these are completed."
@@ -846,8 +889,10 @@ es:
     action_deleted_error: Failed to delete the action
     action_deleted_success: Successfully deleted next action
     action_due_on: "(action due on %{date})"
-    action_marked_complete: The action '%{description}' was marked as %{completed}
-    action_marked_complete_error: The action '%{description}' was NOT marked as %{completed} due to an error on the server.
+    action_marked_complete: The action '%{description}' was marked
+      as %{completed}
+    action_marked_complete_error: The action '%{description}' was
+      NOT marked as %{completed} due to an error on the server.
     action_saved: Action saved
     action_saved_to_tickler: Acción guardada en el recordatorio.
     actions:
@@ -873,7 +918,8 @@ es:
     added_new_project: Added new project
     all_completed: Todas las acciones realizadas
     all_completed_here: aquí
-    all_completed_tagged_page_title: 'TRACKS:: Todas las tareas realizadas con etiqueta %{tag_name}'
+    all_completed_tagged_page_title: 'TRACKS:: Todas las tareas realizadas con etiqueta
+      %{tag_name}'
     append_in_this_project: en este proyecto
     archived_tasks_title: TRACKS::Archived completed tasks
     blocked_by: Blocked by %{predecessors}
@@ -885,7 +931,8 @@ es:
       due_today: Due today
       get_in_ical_format: Get this calendar in iCal format
     calendar_page_title: TRACKS::Calendar
-    cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency to a completed action!
+    cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency
+      to a completed action!
     clear_due_date: Clear due date
     clear_show_from_date: Clear show from date
     completed: Completed
@@ -896,7 +943,8 @@ es:
       other: There are %{count} completed actions in the archive.
     completed_last_day: Completed in the last 24 hours
     completed_last_x_days: Completed in last %{count} days
-    completed_recurrence_completed: There is no next action after the recurring action you just deleted. The recurrence is completed
+    completed_recurrence_completed: There is no next action after the recurring action
+      you just deleted. The recurrence is completed
     completed_recurring: Completed recurring todos
     completed_recurring_actions_title: TRACKS::Completed recurring actions
     completed_rest_of_month: Completado en el resto de este mes
@@ -908,7 +956,8 @@ es:
     confirm_delete: Are you sure that you want to delete the action '%{description}'?
     context_changed: Context changed to %{name}
     convert_to_project: Make project
-    defer_date_after_due_date: Defer date is after due date. Please edit and adjust due date before deferring.
+    defer_date_after_due_date: Defer date is after due date. Please edit and adjust
+      due date before deferring.
     defer_x_days:
       one: Defer one day
       other: Defer %{count} days
@@ -917,7 +966,8 @@ es:
     deferred_tasks_title: TRACKS::Recordatorio
     delete: Delete
     delete_action: Delete action
-    delete_recurring_action_confirm: Are you sure that you want to delete the recurring action '%{description}'?
+    delete_recurring_action_confirm: Are you sure that you want to delete the recurring
+      action '%{description}'?
     delete_recurring_action_title: Delete the recurring action
     deleted_success: The action was deleted successfully.
     depends_on: Depends on
@@ -932,7 +982,8 @@ es:
     error:
       invalid_due_date: Invalid due date
       invalid_show_from_date: Invalid show from date
-    error_completing_todo: There was an error completing / activating the recurring todo %{description}
+    error_completing_todo: There was an error completing / activating the recurring
+      todo %{description}
     error_deleting_item: There was an error deleting the item %{description}
     error_deleting_recurring: There was an error deleting the recurring todo '%{description}'
     error_removing_dependency: There was an error removing the dependency
@@ -952,10 +1003,12 @@ es:
     in_hidden_state: en estado oculto
     in_pending_state: en estado pendiente
     list_incomplete_next_actions: Lista las siguientes tareas incompletas
-    list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next actions
+    list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next
+      actions
     mark_complete: Mark complete
     mobile_todos_page_title: Todas las tareas
-    new_related_todo_created: Una nueva tarea fue añadida y que pertenece a esta tarea recurrente
+    new_related_todo_created: Una nueva tarea fue añadida y que pertenece a esta tarea
+      recurrente
     new_related_todo_created_short: creada una nueva tarea
     new_related_todo_not_created_short: no se creó la tarea
     next_action_description: Descripción de la nueva tarea
@@ -1084,9 +1137,11 @@ es:
       yearly_every_x_day: Every %{month} %{day}
       yearly_every_xth_day: The %{day} %{day_of_week} of %{month}
       yearly_options: Settings for yearly recurring actions
-    recurrence_completed: There is no next action after the recurring action you just finished. The recurrence is completed
+    recurrence_completed: There is no next action after the recurring action you just
+      finished. The recurrence is completed
     recurrence_period: Recurrence period
-    recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added
+    recurring_action_deleted: Action was deleted. Because this action is recurring,
+      a new action was added
     recurring_action_saved: Recurring action saved
     recurring_actions_title: TRACKS::Recurring Actions
     recurring_deleted_success: The recurring action was deleted successfully.
@@ -1110,32 +1165,38 @@ 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: al recordatorio
     unable_to_add_dependency: Unable to add dependency
-    unresolved_dependency: The value you entered in the dependency field did not resolve to an existing action. This value will not be saved with the rest of the action. Continue?
+    unresolved_dependency: The value you entered in the dependency field did not resolve
+      to an existing action. This value will not be saved with the rest of the action.
+      Continue?
     was_due_on_date: was due on %{date}
   users:
     account_signup: Account signup
     approve_tos: I approve the Terms of Service
     auth_change_submit: Change authentication type
-    auth_type_update_error: 'There was a problem updating your authentication type: %{error_messages}'
+    auth_type_update_error: 'There was a problem updating your authentication type:
+      %{error_messages}'
     auth_type_updated: Authentication type updated.
     change_auth_type_title: TRACKS::Change authentication type
     change_authentication_type: Change authentication type
-    change_password_prompt: Enter your new password in the fields below and click 'Change password' to replace your current password with your new one.
+    change_password_prompt: Enter your new password in the fields below and click
+      'Change password' to replace your current password with your new one.
     change_password_submit: Change password
     change_password_title: TRACKS::Change password
     choose_password: Choose password
     confirm_password: Confirm password
     desired_login: Desired login
-    destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their actions, contexts, project and notes. Are you sure that you want to continue?'
+    destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their
+      actions, contexts, project and notes. Are you sure that you want to continue?'
     destroy_error: There was an error deleting the user %{login}
     destroy_successful: User %{login} was successfully destroyed
     destroy_user: Destroy user
     email_address: Email address
     failed_to_delete_user: Failed to delete user %{username}
-    first_user_heading: 'Welcome to TRACKS. To get started, please create an admin account:'
+    first_user_heading: 'Welcome to TRACKS. To get started, please create an admin
+      account:'
     first_user_title: TRACKS::Sign up as the admin user
     identity_url: Identity URL
     label_auth_type: Authentication type
@@ -1145,12 +1206,15 @@ es:
     new_user_heading: 'Sign up a new user:'
     new_user_title: TRACKS::Sign up as the admin user
     no_signups_title: TRACKS::No signups
-    openid_ok_pref_failed: You have successfully verified %{url} as your identity but there was a problem saving your authentication preferences.
-    openid_url_verified: You have successfully verified %{url} as your identity and set your authentication type to OpenID.
+    openid_ok_pref_failed: You have successfully verified %{url} as your identity
+      but there was a problem saving your authentication preferences.
+    openid_url_verified: You have successfully verified %{url} as your identity and
+      set your authentication type to OpenID.
     password_confirmation_label: Confirm password
     password_updated: Password updated.
     register_with_cas: With your CAS username
-    select_authentication_type: Select your new authentication type and click 'Change authentication type' to replace your current settings.
+    select_authentication_type: Select your new authentication type and click 'Change
+      authentication type' to replace your current settings.
     signup: Signup
     signup_new_user: Sign up new user
     signup_successful: Signup successful for user %{username}.
@@ -1167,14 +1231,13 @@ es:
     next_label: Siguiente »
     page_entries_info:
       multi_page: Отображено %{model} %{from} - %{to} из %{count}
-      multi_page_html: Viendo %{model} %{from} - %{to} de %{count} en el total de
+      multi_page_html: Viendo %{model} %{from} - %{to} de %{count}
+        en el total de
       single_page:
-        one: Viendo del 1 %{model}
-        other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
+        one: No %{model} encontrado
+        other: Viendo del 1 %{model}
       single_page_html:
-        one: Viendo del 1 %{model}
-        other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
+        one: No %{model} encontrado
+        other: Viendo del 1 %{model}
     page_gap: "..."
     previous_label: "« Anterior"

From 724524f0d16fa60cdb00a80d8dc6c73203fba3ae Mon Sep 17 00:00:00 2001
From: Francisco Serrador 
Date: Mon, 17 Jan 2022 22:59:26 +0000
Subject: [PATCH 414/767] Translated using Weblate (Spanish)

Currently translated at 89.8% (1003 of 1116 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/es/
---
 config/locales/es.yml | 531 +++++++++++++++++++++---------------------
 1 file changed, 266 insertions(+), 265 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 73996c78..94fac183 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -13,13 +13,14 @@ es:
         mobile_todos_per_page: Tareas por página (Vista Móvil)
         refresh: Intervalo de actualización (en minutos)
         review_period: Intervalo de revisión del proyecto
-        show_completed_projects_in_sidebar: Show completed projects in sidebar
+        show_completed_projects_in_sidebar: Muestra proyectos completados en la barra
+          lateral
         show_hidden_contexts_in_sidebar: Mostrar los contextos ocultos en el lateral
         show_hidden_projects_in_sidebar: Mostrar proyectos ocultos en el lateral
         show_number_completed: Mostrar número de tareas completadas
         show_project_on_todo_done: Ir a la página del proyecto al completar la tarea
         sms_context: Contexto por defecto para el email
-        sms_email: Email origen
+        sms_email: Correo-e origen
         staleness_starts: Comienzo de estancamiento
         time_zone: Zona horaria
         title_date_format: Título del formato de fecha
@@ -28,28 +29,28 @@ es:
         theme: Tema
         email: Correo-e
       project:
-        default_context_name: Default contexto
-        default_tags: Etiquetas estándar
+        default_context_name: Contexto predeterminado
+        default_tags: Etiquetas predeterminadas
         description: Descripción
         name: Nombre
       todo:
         context: Contexto
         description: Descripción
-        due: Fecha límite
+        due: Vencimiento
         notes: Notas
         predecessors: Depende de la
         project: Proyecto
-        show_from: Mostrar
+        show_from: Mostrar desde
         tags: Etiquetas
       user:
-        auth_type: Auth type
-        display_name: Display name
-        email: Email address
+        auth_type: Tipo autoritario
+        display_name: Nombre de pantalla
+        email: Dirección de correo-e
         first_name: Primer nombre
-        last_name: Apellido
-        login: Login
-        open_id_url: OpenID URL
-        password: Password
+        last_name: Apellidos
+        login: Presentación
+        open_id_url: URL OpenID
+        password: Contraseña
         created_at: Creado en
         last_login_at: Última presentación en
     errors:
@@ -61,38 +62,38 @@ es:
         confirmation: no coincide con la confirmación
         empty: no puede estar vacío
         equal_to: debe ser igual a %{count}
-        even: debe ser aún
+        even: debe ser par
         exclusion: está reservado
         greater_than: debe ser mayor que %{count}
         greater_than_or_equal_to: debe ser mayor que o igual a %{count}
         inclusion: no está incluido en la lista
-        invalid: no puede contener el carácter de coma (',')
+        invalid: no es válido
         less_than: debe ser menor que %{count}
         less_than_or_equal_to: debe ser menor o igual a %{count}
         not_a_number: no es un número
-        odd: tiene que ser impar
-        record_invalid: 'Validation failed: %{errors}'
+        odd: debe ser impar
+        record_invalid: 'Validación errónea: %{errors}'
         restrict_dependent_destroy:
           one: Невозможно удалить запись, так как есть %{record} зависящая от нее
           other: Невозможно удалить запись, так как есть %{record} зависящие от нее
           has_one: No se puede borrar la grabación porque existe un %{record} dependiente
           has_many: No se puede borrar la grabación porque existe %{record} dependiente
-        taken: Ya se ha dado
+        taken: ya se ha tomado
         too_long: es demasiado largo (el máximo es %{count} caracteres)
         too_short: es demasiado corto (mínimo %{count} caracteres)
-        wrong_length: es la longitud del mal (debe ser %{count} caracteres)
+        wrong_length: la longitud es errónea (serían %{count} caracteres)
       models:
         project:
           attributes:
             name:
-              blank: proyecto debe tener un nombre
+              blank: el proyecto debe tener un nombre
               taken: ya existe
-              too_long: El nombre del proyecto tiene que tener menos de 256 caracteres
+              too_long: el nombre del proyecto tiene que tener menos de 256 caracteres
       template:
         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'
+          one: Un error ha impedido que se guarde este %{model}
+          other: '%{count} errores han impedido que se guarden este %{model}'
   common:
     action: Tarea
     actions: Tareas
@@ -104,37 +105,37 @@ es:
     back: Atrás
     bugs: Errores
     cancel: Cancelar
-    collapse_expand: Collapse/expand
+    collapse_expand: Colapsar/expandir
     context: Contexto
     contexts: Contextos
     contribute: Contribuir
     create: Crear
     days_midsentence:
-      one: días
-      other: día
+      one: día
+      other: días
     deferred: pospuestas
     description: Descripción
     drag_handle: ARRASTRAR
     email: Email
     errors_with_fields: 'Ha habido problemas con los siguientes campos:'
     first: Primero
-    forth: Siguiente
+    forth: Adelante
     fourth: Cuarto
-    go_back: Volver atrás
+    go_back: Retroceder
     last: Último
     logout: Salir
-    mailing_list: Mailing List
+    mailing_list: Listado de correo
     month: mes
     months: meses
-    next: Próximo
+    next: Siguiente
     none: Ninguno
-    not_available_abbr: n/e
+    not_available_abbr: n/d
     note:
       one: 0 notas
       other: 1 nota
     notes: Notas
     numbered_step: Paso %{number}
-    ok: Ok
+    ok: Aceptar
     optional: opcional
     previous: Anterior
     project: Proyecto
@@ -147,82 +148,77 @@ 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_title: Proyectos de ordenar alfabéticamente
+      alphabetically_confirm: "¿Está seguro que desea ordenar estos proyectos alfabéticamente?\
+        \ Esto reemplazará el orden existente."
+      alphabetically_title: Ordenar proyectos 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: "¿Seguro que desea ordenar estos proyectos por\
+        \ el número de tareas? Esto reemplazará la ordenación existente."
       sort: Ordenar
     third: Tercero
-    todo: Todo
+    todo: pendiente
     update: Actualizar
-    website: Website
+    website: Web
     week: semana
     weeks: semanas
     wiki: Wiki
   contexts:
     add_context: Añadir contexto
-    all_completed_tasks_title: 'TRACKS:: Todas las acciones completadas en ''%{context_name}''
-      contexto'
-    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_name: Nombre del contexto
-    context_state: Context state
-    delete_context: Eliminar 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!"
-    delete_context_title: Eliminar contexto
+    all_completed_tasks_title: 'TRACKS:: Todas las acciones completadas en el contexto
+      ''%{context_name}'''
+    completed_tasks_title: 'Las acciones TRACKS::Completed dentro del contexto ''%{context_name}'''
+    context_deleted: Contexto '%{name}' borrado
+    context_hide: "¿Ocultar página principal?"
+    context_name: Nombre contextual
+    context_state: Estado contextual
+    delete_context: Borrar contexto
+    delete_context_confirmation: "¿Seguro que desea borrar el contexto '%{name}'?\
+      \ ¡Tenga en cuenta que esto también borra todas las acciones (recurrentes) dentro\
+      \ de este contexto!"
+    delete_context_title: Borrar 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})
+    hide_form: Ocultar formulario
+    hide_form_title: Ocultar formulario de contexto nuevo
+    last_completed_in_context: (%{number} último)
     letter_abbreviation: C
-    new_context_post: "' También se ha creado. ¿Está seguro?"
+    new_context_post: "' también será creado. ¿Está seguro?"
     new_context_pre: Nuevo contexto '
-    no_contexts_: 'No contexts '
+    no_contexts_: 'Sin contexto '
     no_contexts_active: Actualmente no hay contextos activos
-    no_contexts_closed: Currently there are no closed contexts
+    no_contexts_closed: Actualmente no hay contextos cerrados
     no_contexts_hidden: Actualmente no hay contextos ocultos
     save_status_message: Contexto guardado
-    show_form: Crear un nuevo contexto
-    show_form_title: Añadir un contexto
+    show_form: Crea un contexto nuevo
+    show_form_title: Añade un contexto
     status_active: El contexto está activo
-    status_hidden: Contexto se oculta
+    status_hidden: El contexto está oculto
     todos_append: en este contexto
     update_status_message: Nombre de contexto ha cambiado
     view_link: 'View context: %{name}'
-    visible_contexts: Contextos visible
+    visible_contexts: Contextos visibles
   data:
     import:
       errors:
-        invalid_destination: "Invalid import destination: %{e}"
+        invalid_destination: ""
         some: Han ocurrido algunos errores durante la importación
-        file_blank: File can't be blank
-        invalid_csv: "Invalid CSV: could not read headers: %{e}"
-        save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write\
-          \ to the upload directory? %{e}"
-      map_title: Map fields to be imported
-      header: Importing data
-      submit: Import
+        file_blank: ''
+        invalid_csv: ""
+        save_error: ""
+      map_title: ''
+      header: Importando datos
+      submit: Importar
       successful: Importación se realizó correctamente.
       target_field: "Import to:"
-      upload: Upload
-      upload_csv: Please upload your CSV file
-      projects_count: "%{count} Projects imported"
-      todos_count: "%{count} Todos imported"
-      yaml_disabled: "YAML loading is disabled"
-      yaml_warning: "%{warning}: all your current data will be destroyed before importing\
-        \ the YAML file, so if you have access to the database, we strongly recommend\
-        \ backing up the database right now in case that anything goes wrong."
-      paste_field: "Paste the contents of the YAML file you exported into the text\
-        \ box below:"
-      warning: Beware
+      upload: Subir
+      upload_csv: ''
+      projects_count: "%{count} proyectos importados"
+      todos_count: "%{count} pendientes importados"
+      yaml_disabled: ""
+      yaml_warning: ""
+      paste_field: ""
+      warning: Aviso
     export:
       page_title: Tracks::Export
       title: Exportar datos
@@ -234,7 +230,7 @@ es:
         \ YAML actualmente esta soportada de forma experimental. No confíe en este\
         \ formato para hacer copias de seguridad de datos importantes."
       csv_description: "%{csv}: Mejor formato para importar en una hoja de cálculo\
-        \ o en programas de análisis de datos."
+        \ o en programas de análisis de datos"
       csv_actions_description: Fichero CSV con todas sus acciones, con contextos por
         nombre y proyectos
       csv_notes_description: Fichero CSV con todas sus notas
@@ -324,7 +320,7 @@ es:
         one: menos de 1 segundo
         other: menos de 1 segundo
       over_x_years:
-        one: más de 1 año
+        one: más de un año
         other: en %{count} años
       x_days:
         one: 1 día
@@ -348,153 +344,154 @@ es:
   errors:
     format: "%{attribute} %{message}"
     messages:
-      accepted: должен быть подтвержден
-      blank: должна быть заполнена
-      confirmation: не соответствует %{attribute}
-      empty: не может быть пустым
-      equal_to: должно равняться %{count}
-      even: должно быть четным
-      exclusion: зарезервированно
-      greater_than: должно быть больше %{count}
-      greater_than_or_equal_to: должно быть больше или равно %{count}
-      inclusion: не входит в список
-      invalid: неверное
-      less_than: должно быть меньше %{count}
-      less_than_or_equal_to: должно быть меньше или равно %{count}
-      not_a_number: не является числом
-      not_an_integer: должно быть целым числом
-      odd: должно быть нечетным
-      other_than: должно отличаться от %{count}
-      present: должно быть пустым
-      taken: уже занято
-      too_long: 'слишком длинное (максимум: %{count} символов)'
-      too_short: 'слишком кроткое (минимум: %{count} символов)'
-      wrong_length: неверной длины (должно быть %{count} символов)
+      accepted: debe ser aceptado
+      blank: no puede estar en blanco
+      confirmation: no coincide con %{attribute}
+      empty: no puede estar vacío
+      equal_to: debe ser igual a %{count}
+      even: debe ser par
+      exclusion: está reservado
+      greater_than: debe ser mayor que %{count}
+      greater_than_or_equal_to: debe ser mayor o igual que %{count}
+      inclusion: no está incluido en el listado
+      invalid: no es válido
+      less_than: debe ser menor que %{count}
+      less_than_or_equal_to: debe ser menor o igual que %{count}
+      not_a_number: no es un número
+      not_an_integer: debe ser un entero
+      odd: debe ser impar
+      other_than: debe ser distinto que %{count}
+      present: debe estar en blanco
+      taken: ya ha sido tomado
+      too_long: 'es muy largo (máximo es %{count} caracteres)'
+      too_short: 'es demasiado corto (mínimo es %{count} caracteres)'
+      wrong_length: es la longitud errónea (debería ser de %{count} caracteres)
     user_unauthorized: '401 No autorizado: Solo los usuarios administrativos pueden
       acceder a esta función.'
   feedlist:
     actions_completed_last_week: Tareas completadas en los últimos 7 días
-    actions_due_next_week: Tareas pendientes en 7 días o menos
-    actions_due_today: Acciones pendientes hoy o antes
-    active_projects_wo_next: Proyectos activos, sin las próximas acciones
+    actions_due_next_week: Tareas vencen en 7 días o menos
+    actions_due_today: Acciones vencen hoy o antes
+    active_projects_wo_next: Proyectos activos, sin las acciones siguientes
     active_starred_actions: Todas las acciones que protagonizó, activa
     all_actions: Todas las tareas
     all_contexts: Todos los contextos
     all_projects: Todos los proyectos
     choose_context: Elija el contexto en el que desea un canal de
     choose_project: Elegir el proyecto que quiere un canal de
-    context_centric_actions: Feeds de acciones incompletas en un contexto específico
+    context_centric_actions: Canales de acciones incompletas en un contexto específico
     context_needed: Es necesario que haya al menos un contexto antes de poder solicitar
-      un feed
-    ical_feed: iCal alimentación
+      un canal
+    ical_feed: Canal iCal
     last_fixed_number: Última/s %{number} accion/es
     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.'
+    notice_incomplete_only: 'Nota: Todos los canales muestran sólo las acciones que
+      no han sido marcadas como realizadas, a menos que se indique lo contrario. Estos
+      canales iCal pueden ser agregados a listados pendientes. Si desea mostrar vencimientos
+      pendientes en un calendario, utilice el canal iCal en la página del calendario'
     plain_text_feed: Canal Texto sin formato
-    project_centric: Feeds de acciones incompletas en un proyecto específico
+    project_centric: Canal de acciones incompletas en un proyecto específico
     project_needed: Es necesario que haya al menos un proyecto antes de poder solicitar
-      un feed
+      un canal
     projects_and_actions: Proyectos activos con sus acciones
-    rss_feed: RSS Feed
-    select_feed_for_context: Seleccione la alimentación de este contexto
-    select_feed_for_project: Seleccione la fuente para este proyecto
+    rss_feed: Canal RSS
+    select_feed_for_context: Seleccione el canal para este contexto
+    select_feed_for_project: Seleccione el canal para este proyecto
   footer:
-    send_feedback: Envía comentarios sobre el %{version}
+    send_feedback: Envía comentarios sobre la %{version}
   helpers:
     select:
-      prompt: Выберите
+      prompt: Seleccione
     submit:
-      create: Создать %{model}
-      submit: Сохранить %{model}
-      update: Обновить %{model}
+      create: Cree %{model}
+      submit: Guardar %{model}
+      update: Actualizar %{model}
   integrations:
-    opensearch_description: Buscar en las Tracks
+    opensearch_description: Buscar en las Pistas
   help:
     title: Help
-    usage: 'You can find information on the usage in the %{manual_link} in the project
-      GitHub wiki.'
+    usage: ''
     manual_link_text: User manual
-    bugs: 'If you encounter a bug or have a feature request, please report it in the
-      %{issue_link}.'
-    issue_link_text: issue queue
+    bugs: ''
+    issue_link_text: ''
     contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link}
       for further information. You can also come discuss with the community:'
     contribute_link_text: project website
     mailing_list_link_text: Mailing list
     irc_bullet: '%{irc_link} (also available in %{matrix_link})'
     irc_link_text: 'IRC channel #Tracks@FreeNode'
-    matrix_link_text: Matrix
+    matrix_link_text: Matriz
   layouts:
     mobile_navigation:
-      calendar: Calendar
+      calendar: Calendario
       contexts: Contextos
-      feeds: Feeds
-      full: Full Site
+      feeds: Claves
+      full: Sitio Lleno
       home: Inicio
       logout: Cerrar sesión
       new_action: Nueva tarea
       projects: Proyectos
-      starred: avoritos
+      starred: Favoritos
       tickler: Recordatorio
     navigation:
       admin: Admin
       api_docs: REST API Docs
       calendar: Calendario
-      calendar_title: Calendario de las acciones por
+      calendar_title: Calendario de las acciones pendientes
       completed_tasks: Hecho
-      completed_tasks_title: Completed
-      contexts_title: Contexts
+      completed_tasks_title: Completado
+      contexts_title: Contextos
       export: Exportar
-      export_title: Importar y exportar datos
-      feeds: Feeds
-      feeds_title: See a list of available feeds
-      group_view_by_context: Group by context
-      group_view_by_project: Group by project
-      group_view_by_title: Change the grouping of the actions on this page
+      export_title: Exportar datos
+      feeds: ''
+      feeds_title: Vea un listado de alimentaciones disponibles
+      group_view_by_context: Grupo por contexto
+      group_view_by_project: Grupo por proyecto
+      group_view_by_title: Cambio de agrupamiento de las acciones en esta página
       help: "?"
-      help_page: Help
+      help_page: Ayuda
       home: Inicio
       home_title: Inicio
-      import: Import
-      import_title: Import data
-      integrations_: Integrar Tracks
+      import: Importar
+      import_title: Importar datos
+      integrations_: Pistas Integradas
       manage_users: Administrar usuarios
       manage_users_title: Añadir o eliminar usuarios
       mobile: Mobile Site
       notes_title: Mostrar todas las notas
-      options: Options
+      options: Opciones
       organize: Organizar
       preferences: Preferencias
       preferences_title: Mostrar mis preferencias
       projects_title: Proyectos
       recurring_todos: Tareas repetitivas
-      recurring_todos_title: Manage recurring actions
-      review_title: Posibilidad de una revisión
-      search: Search All Items
-      show_empty_containers_context: Show empty contexts
-      show_empty_containers_project: Show empty projects
-      show_empty_containers_title: Show or hide the empty projects or contexts
+      recurring_todos_title: Gestión de acciones recurrentes
+      review_title: Crear revisión
+      search: Buscar Todos los Ítemes
+      show_empty_containers_context: Mostrar contextos vacíos
+      show_empty_containers_project: Muestra proyectos vacíos
+      show_empty_containers_title: Muestra u oculta los proyectos vacíos o contenidos
       starred: Estrellas
-      starred_title: See your starred actions
+      starred_title: Vea sus acciones con estrellas
       stats: Estadísticas
-      stats_title: See your statistics
+      stats_title: Vea sus estadísticas
       tickler: Recordatorio
       tickler_title: Recordatorio
       view: Ver
     next_actions_rss_feed: RSS feed of next actions
-    toggle_contexts: Expandir/contraer los contextos
-    toggle_contexts_title: Hacer que los contextos contraídos sea (in)visibles
-    toggle_notes: Activar/Desactivar notas
-    toggle_notes_title: Activar/Desactivar todas las notas
+    toggle_contexts: Conmuta contextos colapsados
+    toggle_contexts_title: Hacer que los contextos colapsados sea (in)visibles
+    toggle_notes: Conmuta anotaciones
+    toggle_notes_title: Conmuta todas las anotaciones
   login:
     account_login: Acceso a la cuenta
     cas_create_account: If you like to request on please go here to %{signup_link}
     cas_logged_in_greeting: Hello, %{username}! You are authenticated.
     cas_login: CAS Login
     cas_no_user_found: Hello, %{username}! You do not have an account on Tracks.
-    cas_signup_link: Request account
-    cas_username_not_found: Sorry, no user by that CAS username exists (%{username})
+    cas_signup_link: Solicitar cuenta
+    cas_username_not_found: Disculpe, ningún usuario por esa id de usuario CAS existe
+      (%{username})
     log_in_again: log in again.
     logged_out: You have been logged out of Tracks.
     login_cas: go to the CAS
@@ -502,35 +499,35 @@ es:
     login_with_openid: 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,
+    option_separator: o,
     please_login: Please log in to use Tracks
     session_time_out: Session has timed out. Please %{link}
     session_will_expire: session will expire after %{hours} hour(s) of inactivity.
-    session_will_not_expire: session will not expire.
+    session_will_not_expire: sesión no caducada.
     sign_in: Entrar
     signup_prompt: Want to create an account?
-    successful: Has entrado con éxito. Bienvenido!
-    successful_with_session_info: 'Login successful:'
-    unsuccessful: Login unsuccessful.
-    user_no_expiry: Stay logged in
+    successful: Has entrado correctamente. ¡Bienvenido de nuevo!
+    successful_with_session_info: 'Entrada correcta:'
+    unsuccessful: Entrada incorrecta.
+    user_no_expiry: Mantener dentro
   models:
     preference:
-      due_in: Due in %{days} days
-      due_on: Due on %{date}
+      due_in: Vence en %{days} días
+      due_on: Vence en %{date}
       due_styles:
-      - Due in ___ days
-      - Due on _______
+      - Vence en ___ días
+      - Vence en _______
       themes:
-        black: Black
-        light_blue: Light blue
+        black: En blanco
+        light_blue: Azul claro
     project:
-      feed_description: Lists all the projects for %{username}
-      feed_title: Tracks Projects
+      feed_description: Enumera todos los proyectos para %{username}
+      feed_title: Proyectos de Seguimiento
     todo:
-      error_date_must_be_future: must be a date in the future
+      error_date_must_be_future: debe ser una fecha futura
     user:
-      error_context_not_associated: Context id %{context} not associated with user
-        id %{user}.
+      error_context_not_associated: ID de contexto %{context} no asociado con el id
+        %{user} del usuario.
       error_project_not_associated: Project id %{project} not associated with user
         id %{user}.
   notes:
@@ -540,14 +537,14 @@ es:
     delete_note_title: Delete the note '%{id}'
     deleted_note: Deleted note '%{id}'
     edit_item_title: Edit item
-    in_project: 'En:'
+    in_project: 'En: '
     no_notes_available: 'Currently there are no notes: add notes to projects from
       individual project pages.'
     note_header: Note %{id}
-    note_link_title: Show note %{id}
-    note_location_link: 'In:'
-    save_status_message: Note %{id} was saved
-    show_note_title: Show note
+    note_link_title: Mostrar nota %{id}
+    note_location_link: 'En:'
+    save_status_message: Nota %{id} fue guardada
+    show_note_title: Mostrar nota
   number:
     currency:
       format:
@@ -568,17 +565,17 @@ es:
       decimal_units:
         format: "%n %u"
         units:
-          billion: Миллиард
-          million: Миллион
-          quadrillion: Квадрильон
-          thousand: Тысяча
-          trillion: Триллион
+          billion: Billón
+          million: Millón
+          quadrillion: Cuatrillón
+          thousand: Millar
+          trillion: Trillón
           unit: "."
       format:
         delimiter: Delimiter
         precision: '1'
-        significant: 'true'
-        strip_insignificant_zeros: 'true'
+        significant: 'verdadero'
+        strip_insignificant_zeros: 'verdadero'
       storage_units:
         format: "%n %u"
         units:
@@ -588,7 +585,7 @@ es:
           gb: GB
           kb: KB
           mb: MB
-          tb: Tuberculosis
+          tb: TB
     percentage:
       format:
         delimiter: Delimiter
@@ -597,26 +594,27 @@ es:
       format:
         delimiter: Delimiter
   preferences:
-    authentication_header: Your authentication
-    change_authentication_type: Change your authentication type
-    change_identity_url: Change Your Identity URL
-    change_password: Change your password
-    current_authentication_type: Your authentication type is %{auth_type}
-    edit_preferences: Edit preferences
-    generate_new_token: Generate a new token
-    generate_new_token_confirm: Are you sure? Generating a new token will replace
-      the existing one and break any external usages of this token.
-    is_false: 'false'
-    is_true: 'true'
-    open_id_url: Your OpenID URL is
+    authentication_header: Su autenticación
+    change_authentication_type: Cambie su tipo autenticado
+    change_identity_url: Cambie su URL de su Identidad
+    change_password: Cambiar su contraseña
+    current_authentication_type: Su tipo de autenticación es %{auth_type}
+    edit_preferences: Editar preferencias
+    generate_new_token: Genera un vale nuevo
+    generate_new_token_confirm: ¿Seguro? Generar un vale nuevo reemplazara el existente
+      y romperá los usos de este vale.
+    is_false: 'falso'
+    is_true: 'verdadero'
+    open_id_url: Su URL OpenID es
     page_title: TRACKS::Preferences
     page_title_edit: TRACKS::Edit Preferences
-    password_changed: Que ha cambiado la contraseña, por favor vuelve a iniciar sesión.
+    password_changed: Su contraseña ha sido modificada, por favor vuelve a iniciar
+      sesión.
     remove_introduction: You can remove your user account here. Note that this is
       irreversible and will remove all your data! After removal you will be logged
       out.
-    show_number_completed: Show %{number} completed items
-    sms_context_none: None
+    show_number_completed: Muestra los %{number} elementos completados
+    sms_context_none: Ninguno
     staleness_starts_after: Staleness starts after %{days} days
     tabs:
       authentication: Autenticación
@@ -626,7 +624,7 @@ es:
       tracks_behavior: Rastrea el comportamiento de
     title: Your preferences
     token_description: Token (for feeds and API use)
-    token_header: Your token
+    token_header: Su vale
     updated: Las preferencias de actualización
   projects:
     actions_in_project_title: Acciones en este proyecto
@@ -645,11 +643,10 @@ es:
     default_context_removed: Eliminado el contexto por defecto
     default_context_set: Set project's default context to %{default_context}
     default_tags_removed_notice: Removed the default tags
-    deferred_actions: Deferred actions
-    deferred_actions_empty: Deferred actions empty
-    delete_project: Delete project
-    delete_project_confirmation: Are you sure that you want to delete the project
-      '%{name}'?
+    deferred_actions: Acciones diferidas
+    deferred_actions_empty: Acciones diferidas vacías
+    delete_project: Borrar proyecto
+    delete_project_confirmation: ¿Seguro que quiere borrar el proyecto '%{name}'?
     delete_project_title: Delete the project
     edit_project_settings: Edit Project Settings
     edit_project_title: Editar proyecto
@@ -657,7 +654,7 @@ es:
     hide_form: Esconder formulario
     hide_form_title: Hide new project form
     is_active: está activo
-    last_completed_in_project: "(last %{number})"
+    last_completed_in_project: "(último %{number})"
     letter_abbreviation: P
     list_completed_projects: 'TRACKS:: Lista de Proyectos Realizados'
     list_projects: TRACKS::Lista de Proyectos
@@ -671,37 +668,37 @@ es:
     notes: Notes
     notes_empty: No hay notas para este proyecto
     page_title: 'TRACKS::Project: %{project}'
-    project_destroyed_status: Deleted project '%{name}'
-    project_saved_status: Project saved
-    project_state: Project is %{state}.
+    project_destroyed_status: Proyecto «%{name}» borrado
+    project_saved_status: Proyecto guardado
+    project_state: El proyecto es %{state}.
     set_default_tags_notice: Set project's default tags to %{default_tags}
-    settings: Settings
-    show_form: Add a project
-    show_form_title: Create a new project
+    settings: Parámetros
+    show_form: Agrega un proyecto
+    show_form_title: Crea un proyecto nuevo
     state: Este proyecto está %{state}
-    status_project_name_changed: Name of project was changed
+    status_project_name_changed: El nombre del proyecto fue cambiado
     this_project: Este proyecto
-    to_new_project_page: Take me to the new project page
-    view_link: 'View project: %{name}'
-    was_marked_complete: has been marked as completed
-    was_marked_hidden: has been marked as hidden
-    with_default_context: with a default context of '%{context_name}'
-    with_default_tags: and with '%{tags}' as the default tags
+    to_new_project_page: Lléveme a la página del proyecto nuevo
+    view_link: 'Vista del proyecto: %{name}'
+    was_marked_complete: ha sido marcado como completado
+    was_marked_hidden: ha sido marcado como oculto
+    with_default_context: con un contexto predeterminado de «%{context_name}»
+    with_default_tags: y con '%{tags}' como los etiquetados predeterminados
     with_no_default_context: with no default context
     with_no_default_tags: and with no default tags
   search:
     contexts_matching_query: Contexts matching query
     no_results: Your search yielded no results.
     notes_matching_query: Notes matching query
-    projects_matching_query: Projects matching query
+    projects_matching_query: Proyectos cotejan solicitud
     tags_matching_query: Tags matching query
     todos_matching_query: Todos matching query
   shared:
     add_action: Añadir tarea
     add_actions: Añadir tareas
     add_context: Agregue contexto
-    context_for_all_actions: Context for all actions
-    hide_action_form_title: Hide new action form
+    context_for_all_actions: Contexto para todas las acciones
+    hide_action_form_title: Ocultar formulario de acción nueva
     hide_form: Esconder formulario
     make_actions_dependent: Asegúrese que las acciones dependen unos de otros
     multiple_next_actions: Multiple next actions (one on each line)
@@ -736,7 +733,7 @@ es:
     current: Hasta al día
     current_plural: Hasta al día
     hidden: Hidden
-    hidden_plural: Hidden
+    hidden_plural: Oculto
     projects:
       ":": ":"
       active: Active projects
@@ -774,7 +771,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: ' y posterior'
     actions_last_year: Actions in the last years
     actions_last_year_legend:
       months_ago: Months ago
@@ -782,9 +779,9 @@ 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: 'Acciones seleccionadas desde semana '
     click_to_return: Click %{link} to return to the statistics page.
-    click_to_return_link: here
+    click_to_return_link: aquí
     click_to_show_actions_from_week: Click %{link} to show the actions from week %{week}
       and further.
     click_to_update_actions: Click on a bar in the chart to update the actions below.
@@ -801,7 +798,7 @@ es:
       month_avg_created: "%{months} Month avg created"
     legend:
       actions: Tareas
-      day_of_week: Day of week
+      day_of_week: Día de semana
       months_ago: Months ago
       number_of_actions: Número de tareas
       number_of_days: Number of days ago
@@ -816,7 +813,7 @@ es:
       actions: Acciones
       weeks: Semanas atrás
     other_actions_label: "(otros)"
-    projects: Projects
+    projects: Proyectos
     running_time_all: Current running time of all incomplete actions
     running_time_all_legend:
       actions: Tareas
@@ -835,7 +832,7 @@ es:
     tag_cloud_description: This tag cloud includes tags of all actions (completed,
       not completed, visible and/or hidden)
     tag_cloud_title: Tag cloud for all actions
-    tags: Tags
+    tags: Etiquetas
     time_of_day: Time of day (all actions)
     time_of_day_legend:
       number_of_actions: Número de tareas
@@ -869,9 +866,9 @@ es:
     within_one: Dentro de un
   support:
     array:
-      last_word_connector: ", y"
-      two_words_connector: y
-      words_connector: ","
+      last_word_connector: ", y "
+      two_words_connector: ' y '
+      words_connector: ", "
     select:
       prompt: Por favor seleccione
   time:
@@ -894,14 +891,14 @@ es:
     action_marked_complete_error: The action '%{description}' was
       NOT marked as %{completed} due to an error on the server.
     action_saved: Action saved
-    action_saved_to_tickler: Acción guardada en el recordatorio.
+    action_saved_to_tickler: Acción guardada en el recordatorio
     actions:
       completed: Completed actions
       context_completed: Completed actions in this context
       context_deferred_pending: Deferred/pending actions in this context
       context_without_project: Actions without project in %{param}
       home_completed: Completed actions
-      home_without_project: Actions without project
+      home_without_project: Acciones sin proyecto
       project_completed: Completed actions in this project
       project_deferred_pending: Deferred/pending actions in this project
       project_project: Actions in this project
@@ -915,11 +912,11 @@ es:
     added_new_next_action: Added new next action
     added_new_next_action_plural: Added new next actions
     added_new_next_action_singular: Added new next action
-    added_new_project: Added new project
+    added_new_project: Proyecto nuevo añadido
     all_completed: Todas las acciones realizadas
     all_completed_here: aquí
-    all_completed_tagged_page_title: 'TRACKS:: Todas las tareas realizadas con etiqueta
-      %{tag_name}'
+    all_completed_tagged_page_title: 'TRACKS::All Todas las tareas realizadas con
+      etiqueta %{tag_name}'
     append_in_this_project: en este proyecto
     archived_tasks_title: TRACKS::Archived completed tasks
     blocked_by: Blocked by %{predecessors}
@@ -928,7 +925,7 @@ es:
       due_next_week: Due next week
       due_this_month: Due in rest of %{month}
       due_this_week: Due in rest of this week
-      due_today: Due today
+      due_today: Vence hoy
       get_in_ical_format: Get this calendar in iCal format
     calendar_page_title: TRACKS::Calendar
     cannot_add_dependency_to_completed_todo: Cannot add this action as a dependency
@@ -937,7 +934,7 @@ es:
     clear_show_from_date: Clear show from date
     completed: Completed
     completed_actions: Completed actions
-    completed_actions_with: Acciones completadas with the tag %{tag_name}
+    completed_actions_with: Acciones completadas con la lengüeta «%{tag_name}»
     completed_in_archive:
       one: There is one completed action in the archive.
       other: There are %{count} completed actions in the archive.
@@ -965,15 +962,15 @@ es:
     deferred_pending_actions: Deferred/pending actions
     deferred_tasks_title: TRACKS::Recordatorio
     delete: Delete
-    delete_action: Delete action
-    delete_recurring_action_confirm: Are you sure that you want to delete the recurring
-      action '%{description}'?
+    delete_action: Borrar acción
+    delete_recurring_action_confirm: Seguro que desea borrar la acción recurrente
+      «%{description}»?
     delete_recurring_action_title: Delete the recurring action
     deleted_success: The action was deleted successfully.
     depends_on: Depends on
     depends_on_separate_with_commas: Depende de (separar con comas)
     done: Done?
-    drag_action_title: Drag onto another action to make it depend on that action
+    drag_action_title: ''
     due: Fecha límite
     edit: Edit
     edit_action: Edit action
@@ -985,7 +982,8 @@ es:
     error_completing_todo: There was an error completing / activating the recurring
       todo %{description}
     error_deleting_item: There was an error deleting the item %{description}
-    error_deleting_recurring: There was an error deleting the recurring todo '%{description}'
+    error_deleting_recurring: Hubo un error borrando la recursividad «%{description}»
+      pendiente
     error_removing_dependency: There was an error removing the dependency
     error_saving_recurring: There was an error saving the recurring todo '%{description}'
     error_starring: Could not toggle the star of this todo '%{description}'
@@ -995,7 +993,7 @@ es:
     feed_title_in_project: in project '%{project}'
     feeds:
       completed: 'Completed: %{date}'
-      due: 'Due: %{date}'
+      due: 'Vence: %{date}'
     has_x_pending:
       one: Tiene una tarea pendiente
       other: Tiene %{count} tareas pendientes
@@ -1005,15 +1003,15 @@ es:
     list_incomplete_next_actions: Lista las siguientes tareas incompletas
     list_incomplete_next_actions_with_limit: Lists the last %{count} incomplete next
       actions
-    mark_complete: Mark complete
+    mark_complete: Marca completa
     mobile_todos_page_title: Todas las tareas
     new_related_todo_created: Una nueva tarea fue añadida y que pertenece a esta tarea
       recurrente
     new_related_todo_created_short: creada una nueva tarea
     new_related_todo_not_created_short: no se creó la tarea
     next_action_description: Descripción de la nueva tarea
-    next_action_needed: You need to submit at least one next action
-    next_actions_description: 'Filter:'
+    next_action_needed: Requiere enviar al menos una acción siguiente
+    next_actions_description: 'Filtrador:'
     next_actions_description_additions:
       completed: in the last %{count} days
       due_date: with a due date %{due_date} or earlier
@@ -1025,11 +1023,11 @@ es:
       overdue_by_plural: Overdue by %{days} days
     next_actions_title: Tracks - Next Actions
     next_actions_title_additions:
-      completed: actions completed
-      due_today: due today
-      due_within_a_week: due within a week
+      completed: acciones completadas
+      due_today: vence hoy
+      due_within_a_week: vence en una semana
     no_actions:
-      completed: Actualmente no hay acciones completadas.
+      completed: Actualmente no hay acciones completadas
       completed_recurring: Currently there are no completed recurring todos
       completed_rest_of_month: No actions were completed in the rest of this month
       completed_rest_of_week: No actions were completed in the rest of this week
@@ -1113,7 +1111,7 @@ es:
         - October
         - November
         - December
-        on_day_n: on day  %{n}
+        on_day_n: el día %{n}
         on_work_days: on work days
         second: second
         show: show
@@ -1146,7 +1144,7 @@ es:
     recurring_actions_title: TRACKS::Recurring Actions
     recurring_deleted_success: The recurring action was deleted successfully.
     recurring_pattern_removed: El patrón de repetición se retira de %{count}
-    recurring_todos: Recurring todos
+    recurring_todos: Recursión pendiente
     remove_dependency: Remove dependency (does not delete the action)
     removed_predecessor: Removed %{successor} as dependency from %{predecessor}.
     scheduled_overdue: Scheduled to show %{days} days ago
@@ -1231,13 +1229,16 @@ es:
     next_label: Siguiente »
     page_entries_info:
       multi_page: Отображено %{model} %{from} - %{to} из %{count}
-      multi_page_html: Viendo %{model} %{from} - %{to} de %{count}
-        en el total de
+      multi_page_html: Representando %{model} %{from} - %{to} de
+        %{count} en el total
       single_page:
         one: No %{model} encontrado
         other: Viendo del 1 %{model}
       single_page_html:
         one: No %{model} encontrado
         other: Viendo del 1 %{model}
-    page_gap: "..."
+    page_gap: "…"
     previous_label: "« Anterior"
+  rest_help:
+    auth:
+      title: Autenticación

From a26ee3d62ddc4587f362f4d2b3573a3f161051ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20H=C3=BCseyin=20Ekseli?= 
Date: Mon, 24 Jan 2022 12:11:14 +0000
Subject: [PATCH 415/767] Translated using Weblate (Turkish)

Currently translated at 30.5% (341 of 1116 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/tr/
---
 config/locales/tr.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 0d4e107f..985d6948 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -141,6 +141,15 @@ common:
   add: Ekle
   actions: Eylemler
   action: Eylem
+  days_midsentence:
+    one: Gün
+    other: Günler
+  note:
+    one: Not yok
+    other: 1 not var
+  actions_midsentence:
+    one: Eylem
+    other: Eylemler
 activerecord:
   errors:
     template:
@@ -241,6 +250,8 @@ date:
   - Pe
   - Cu
   - Ct
+  - Cum
+  - Cmt
   abbr_month_names:
   - Kas
   - Oca
@@ -253,6 +264,8 @@ date:
   - Ağu
   - Eyl
   - Eki
+  - Kas
+  - Ara
   day_names:
   - Pazar
   - Pazartesi
@@ -279,9 +292,11 @@ date:
   - Ekim
   - Kasım
   - Aralık
+  - Aralık
   order:
   - :yıl
   - :gün
+  - :day
 datetime:
   prompts:
     day: Gün
@@ -390,6 +405,17 @@ integrations:
     için: %{documentation_link}'
   developer_documentation_link: Tracks için geliştirici dokümantasyonu
   contents_header: 'İçerikler:'
+  tell_us_link_text: Bunun hakkında bize görüş bildirin
+  cron_2: Başka bir metin kullanabilirsiniz %{feeds_link} Projede birlikte çalıştığınız
+    meslektaşlarınıza neden listeyi e-posta gönderemeyesiniz ki?
+  cron_email_subject: Bitimi 7 gün içerisinde olan Tracks eylemleri
+  feeds_link_text: akış Tracks tarafından sağlanmıştır
+  cron_1: Bu girdiyi crontab üzerinden girerseniz, her gün ÖÖ 5'te 7 gün içerisinde
+    bitimi yaklaşan eylemlerle ilgili bir e-posta alacaksınız.
+  message_gateway:
+    rich_api_tip: Mesaj içeriği tanım, içerik ve proje kısmına, not ise gövde metnine
+      yazarak "çamaşırları yıka @ Ev" veya "Mehmet'i Ara > x projesi" ve benzeri türden
+      görevler oluşturmak için Rich Todo API kullanabilirsiniz.
 footer:
   send_feedback: Geri bildirim gönderin %{version}
 helpers:

From 1f363db3802a9f5b4d577bb54ab91dc8dcb704fc Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Wed, 2 Feb 2022 23:54:22 +0000
Subject: [PATCH 416/767] Translated using Weblate (Finnish)

Currently translated at 99.8% (1114 of 1116 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/
---
 config/locales/fi.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 41ced1b2..c0da25dc 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,9 +131,8 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: 1 muistiinpano
-      other: "%{count} muistiinpanoa"
-      zero: ei muistiinpanoja
+      one: ei muistiinpanoja
+      other: 1 muistiinpano
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -756,7 +755,7 @@ fi:
     no_last_completed_recurring_todos: Valmiita toistuvia toimenpiteitä ei löytynyt
     no_notes_attached: Projektiin ei ole liitetty muistiinpanoja
     no_projects: Projekteja ei löytynyt
-    notes: Notes
+    notes: Muistiinpanot
     notes_empty: Tälle projektille ei ole muistiinpanoja
     page_title: 'TRACKS::Project: %{project}'
     project_destroyed_status: Projekti ”%{name}” poistettu
@@ -1158,7 +1157,7 @@ fi:
     no_last_completed_actions: Valmistuneita toimenpiteitä ei ole
     no_project: "--No project--"
     no_recurring_todos: Ei toistuvia toimenpiteitä
-    notes: Notes
+    notes: Muistiinpanot
     overdue: Myöhässä
     pending: Odottaa
     recurrence:
@@ -1332,13 +1331,11 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
       single_page_html:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From 2b2acb494aade60d36511a4763bd3dbd046df5ba Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Fri, 4 Feb 2022 17:32:11 +0200
Subject: [PATCH 417/767] Fixed the plurals again.

---
 config/locales/en.yml | 33 ++++++++++++++++++++-------------
 config/locales/es.yml | 28 +++++++++++++++++-----------
 config/locales/fi.yml | 15 +++++++++------
 3 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 38e489d4..983aee73 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -96,8 +96,9 @@ en:
     action: Action
     actions: Actions
     actions_midsentence:
-      one: actions
-      other: action
+      one: action
+      other: actions
+      zero: actions
     add: Add
     ajaxError: There was an error retrieving from server
     back: Back
@@ -109,8 +110,9 @@ en:
     contribute: Contribute
     create: Create
     days_midsentence:
-      one: days
-      other: day
+      one: day
+      other: days
+      zero: days
     deferred: deferred
     description: Description
     drag_handle: DRAG
@@ -129,8 +131,9 @@ en:
     none: None
     not_available_abbr: n/a
     note:
-      one: no notes
-      other: 1 notes
+      one: 1 notes
+      other: "%{count} notes"
+      zero: no notes
     notes: Notes
     numbered_step: Step %{number}
     ok: Ok
@@ -317,11 +320,13 @@ en:
         other: almost %{count} years
       half_a_minute: half a minute
       less_than_x_minutes:
-        one: less than 1 minute
-        other: less than a minute
+        one: less than a minute
+        other: less than %{count} minutes
+        zero: less than 1 minute
       less_than_x_seconds:
         one: less than 1 second
-        other: less than 1 second
+        other: less than %{count} seconds
+        zero: less than 1 second
       over_x_years:
         one: over 1 year
         other: over %{count} years
@@ -1320,11 +1325,13 @@ en:
       multi_page_html: Displaying %{model} %{from} - %{to} of %{count}
         in total
       single_page:
-        one: No %{model} found
-        other: Displaying 1 %{model}
+        one: Displaying 1 %{model}
+        other: Displaying all %{count} %{model}
+        zero: No %{model} found
       single_page_html:
-        one: No %{model} found
-        other: Displaying 1 %{model}
+        one: Displaying 1 %{model}
+        other: Displaying all %{count} %{model}
+        zero: No %{model} found
     page_gap: "…"
     previous_label: "← Previous"
   auth_type:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 94fac183..387ad0c0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -98,8 +98,9 @@ es:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tareas
-      other: tarea
+      one: tarea
+      other: tareas
+      zero: tareas
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -131,8 +132,9 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 0 notas
-      other: 1 nota
+      one: 1 nota
+      other: "%{count} notas"
+      zero: 0 notas
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -314,11 +316,13 @@ es:
         other: Casi %{count} años
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de 1 minuto
-        other: menos de un minuto
+        one: menos de un minuto
+        other: menos de %{count} minutos
+        zero: menos de 1 minuto
       less_than_x_seconds:
         one: menos de 1 segundo
-        other: menos de 1 segundo
+        other: menos de %{count} segundos
+        zero: menos de 1 segundo
       over_x_years:
         one: más de un año
         other: en %{count} años
@@ -1232,11 +1236,13 @@ es:
       multi_page_html: Representando %{model} %{from} - %{to} de
         %{count} en el total
       single_page:
-        one: No %{model} encontrado
-        other: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
+        other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
       single_page_html:
-        one: No %{model} encontrado
-        other: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
+        other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
     page_gap: "…"
     previous_label: "« Anterior"
   rest_help:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c0da25dc..a3761cb0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,8 +131,9 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: ei muistiinpanoja
-      other: 1 muistiinpano
+      one: 1 muistiinpano
+      other: "%{count} muistiinpanoa"
+      zero: ei muistiinpanoja
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1331,11 +1332,13 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
       single_page_html:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From 3e11894caf4628c31b88c7d0d50c1ea532a3512f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Feb 2022 00:21:41 +0000
Subject: [PATCH 418/767] Bump kt-paperclip from 7.0.1 to 7.1.0

Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip) from 7.0.1 to 7.1.0.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases)
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS)
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.0.1...v7.1.0)

---
updated-dependencies:
- dependency-name: kt-paperclip
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index bd3019de..536f6302 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'aasm', '~> 5.2.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.16'
 gem 'htmlentities'
-gem "kt-paperclip", "~> 7.0"
+gem "kt-paperclip", "~> 7.1"
 gem 'puma', '~> 5.6'
 gem 'rails_autolink'
 gem 'RedCloth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f8513aa..e392616a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,7 +112,7 @@ GEM
       activesupport (>= 5.0)
     highline (2.0.3)
     htmlentities (4.3.4)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -135,7 +135,7 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    kt-paperclip (7.0.1)
+    kt-paperclip (7.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       marcel (~> 1.0.1)
@@ -154,7 +154,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.7.1)
     minitest (5.15.0)
@@ -310,7 +310,7 @@ GEM
     will_paginate (3.3.1)
     yard (0.9.27)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -334,7 +334,7 @@ DEPENDENCIES
   i18n-tasks (~> 0.9.37)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
-  kt-paperclip (~> 7.0)
+  kt-paperclip (~> 7.1)
   listen
   minitest-stub-const
   mocha

From 861a007beaa6c4abbd04fff94971a9806e50693e Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Fri, 4 Feb 2022 23:58:02 +0000
Subject: [PATCH 419/767] Translated using Weblate (Finnish)

Currently translated at 99.6% (1112 of 1116 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/
---
 config/locales/fi.yml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a3761cb0..7d6c0957 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -63,14 +63,14 @@ fi:
         empty: ei voi olla tyhjä
         equal_to: täytyy olla sama kuin %{count}
         even: täytyy olla tasan
-        exclusion: is reserved
+        exclusion: on varattu
         greater_than: täytyy olla suurempi kuin %{count}
         greater_than_or_equal_to: täytyy olla suurempi tai yhtäsuuri kuin %{count}
         inclusion: ei sisälly listaan
-        invalid: cannot contain the comma (',') character
+        invalid: ei voi sisältää pilkkua
         less_than: täytyy olla vähemmän kuin %{count}
         less_than_or_equal_to: täytyy olla vähemmän tai yhtäsuuri kuin %{count}
-        not_a_number: is not a number
+        not_a_number: ei ole numero
         odd: täytyy olla pariton
         record_invalid: 'Validointi epäonnistui: %{errors}'
         restrict_dependent_destroy:
@@ -131,9 +131,8 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: 1 muistiinpano
-      other: "%{count} muistiinpanoa"
-      zero: ei muistiinpanoja
+      one: ei muistiinpanoja
+      other: 1 muistiinpano
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -192,7 +191,7 @@ fi:
     save_status_message: Asiayhteys tallennettu
     show_form: Luo uusi asiayhteys
     show_form_title: Lisää asiayhteys
-    status_active: Context is active
+    status_active: Asiayhteys on aktiivinen
     status_hidden: Asiayhteys on piilotettu
     todos_append: tässä asiayhteydessä
     update_status_message: Asiayhteyden nimi muutettiin
@@ -745,7 +744,7 @@ fi:
     hidden_projects: Piilotetut projektit
     hide_form: Piilota lomake
     hide_form_title: Piilota projektinluontilomake
-    is_active: is active
+    is_active: on aktiivinen
     last_completed_in_project: "(viimeiset %{number})"
     letter_abbreviation: P
     list_completed_projects: TRACKS::Valmistuneiden projektien lista
@@ -775,7 +774,7 @@ fi:
     was_marked_hidden: on merkitty piilotetuksi
     with_default_context: with a default context of '%{context_name}'
     with_default_tags: ja oletusasiasanoilla ”%{tags}”
-    with_no_default_context: with no default context
+    with_no_default_context: ilman oletusasiayhteyttä
     with_no_default_tags: ja ilman oletusavainsanoja
   search:
     contexts_matching_query: hakua vastaavaa asiayhteyttä
@@ -1332,13 +1331,11 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
       single_page_html:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From eaf6d4f0a457c79416a04e421c5eefa8dc0be467 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 8 Feb 2022 23:42:13 +0200
Subject: [PATCH 420/767] Fix the plurals again in FI

---
 config/locales/fi.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 7d6c0957..da2d4bcc 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,8 +131,9 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: ei muistiinpanoja
-      other: 1 muistiinpano
+      one: 1 muistiinpano
+      other: "%{count} muistiinpanoa"
+      zero: ei muistiinpanoja
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1331,11 +1332,13 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
       single_page_html:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From c2bd1b0d81a36908cb3e003cf3daddb8e603e0bb Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Wed, 9 Feb 2022 11:28:05 +0200
Subject: [PATCH 421/767] Error message fixes for CSV import. Add the necessary
 directory to Docker image.

---
 Dockerfile                         | 17 ++++++++++++++++-
 app/controllers/data_controller.rb |  8 ++++++--
 app/models/todo.rb                 |  4 ++++
 public/uploads/csv/.keep           |  0
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 public/uploads/csv/.keep

diff --git a/Dockerfile b/Dockerfile
index 6faeffe5..d17e68ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,25 @@ RUN apt-get update && apt-get install -y yarn netcat
 
 RUN mkdir /app/log
 
-COPY . /app/
+COPY COPYING /app/
+COPY config /app/config/
 COPY config/database.docker.yml /app/config/database.yml
 COPY config/site.docker.yml /app/config/site.yml
 
+COPY bin /app/bin/
+COPY script /app/script/
+COPY public /app/public/
+COPY vendor /app/vendor/
+
+COPY .yardopts /app/
+COPY Rakefile /app/
+COPY config.ru /app/
+COPY docker-entrypoint.sh /app/
+
+COPY lib /app/lib/
+COPY app /app/app/
+COPY db /app/db/
+
 RUN RAILS_ENV=production bundle exec rake assets:precompile
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb
index e9893f16..9ed72b43 100644
--- a/app/controllers/data_controller.rb
+++ b/app/controllers/data_controller.rb
@@ -62,12 +62,16 @@ class DataController < ApplicationController
         flash[:notice] = t 'data.import.projects_count', count: count
       when 'todos'
         count = Todo.import path_and_file, params, current_user
-        flash[:notice] = t 'data.import.todos.count', count: count
+        if not count
+          flash[:error] = t('data.import.errors.invalid_destination')
+        else
+          flash[:notice] = t 'data.import.todos_count', count: count
+        end
       else
         flash[:error] = t('data.import.errors.invalid_destination')
       end
     rescue Exception => e
-      flash[:error] = t 'data.import.invalid_destination', e: e
+      flash[:error] = t 'data.import.errors.invalid_destination', e: e
     end
     File.delete(path_and_file)
     redirect_to import_data_path
diff --git a/app/models/todo.rb b/app/models/todo.rb
index c97f3ade..79972055 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -353,6 +353,10 @@ class Todo < ApplicationRecord
 
   def self.import(filename, params, user)
     default_context = user.contexts.order('id').first
+    if default_context.nil?
+      logger.error "No available contexts in import"
+      return FALSE
+    end
 
     count = 0
     CSV.foreach(filename, headers: true) do |row|
diff --git a/public/uploads/csv/.keep b/public/uploads/csv/.keep
new file mode 100644
index 00000000..e69de29b

From 511a4a23b6535c7507ede54e8b864cc059824f10 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Wed, 9 Feb 2022 11:48:09 +0200
Subject: [PATCH 422/767] Better error messages

---
 app/controllers/data_controller.rb | 4 ++--
 app/models/todo.rb                 | 5 +----
 config/locales/en.yml              | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb
index 9ed72b43..218de1e0 100644
--- a/app/controllers/data_controller.rb
+++ b/app/controllers/data_controller.rb
@@ -62,8 +62,8 @@ class DataController < ApplicationController
         flash[:notice] = t 'data.import.projects_count', count: count
       when 'todos'
         count = Todo.import path_and_file, params, current_user
-        if not count
-          flash[:error] = t('data.import.errors.invalid_destination')
+        if ! count
+          flash[:error] = t('data.import.errors.no_context')
         else
           flash[:notice] = t 'data.import.todos_count', count: count
         end
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 79972055..acfe032f 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -353,10 +353,7 @@ class Todo < ApplicationRecord
 
   def self.import(filename, params, user)
     default_context = user.contexts.order('id').first
-    if default_context.nil?
-      logger.error "No available contexts in import"
-      return FALSE
-    end
+    return false if default_context.nil?
 
     count = 0
     CSV.foreach(filename, headers: true) do |row|
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 983aee73..67613cee 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -207,6 +207,7 @@ en:
         invalid_csv: "Invalid CSV: could not read headers: %{e}"
         save_error: "Could not save uploaded CSV (%{path_and_file}). Can Tracks write\
           \ to the upload directory? %{e}"
+        no_context: No default context could be found
       map_title: Map fields to be imported
       header: Importing data
       submit: Import

From dfdab8af557fa259ead3bd6e6d94642f1b7e0b11 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Wed, 9 Feb 2022 11:50:16 +0200
Subject: [PATCH 423/767] CS fix

---
 app/controllers/data_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb
index 218de1e0..610ae047 100644
--- a/app/controllers/data_controller.rb
+++ b/app/controllers/data_controller.rb
@@ -62,7 +62,7 @@ class DataController < ApplicationController
         flash[:notice] = t 'data.import.projects_count', count: count
       when 'todos'
         count = Todo.import path_and_file, params, current_user
-        if ! count
+        if !count
           flash[:error] = t('data.import.errors.no_context')
         else
           flash[:notice] = t 'data.import.todos_count', count: count

From 889afc6667a1338d8254c0992d0e7966a93cde89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 00:07:03 +0000
Subject: [PATCH 424/767] Bump rspec-expectations from 3.10.2 to 3.11.0

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.10.2...v3.11.0)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e392616a..5190290c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,10 +222,10 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec-expectations (3.10.2)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)

From 237b0591cfac00fd88afe3b042eb523cd9e09014 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 00:07:15 +0000
Subject: [PATCH 425/767] Bump kt-paperclip from 7.1.0 to 7.1.1

Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases)
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS)
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.1.0...v7.1.1)

---
updated-dependencies:
- dependency-name: kt-paperclip
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e392616a..86c89074 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    kt-paperclip (7.1.0)
+    kt-paperclip (7.1.1)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       marcel (~> 1.0.1)

From 6487527bbe39bf37b77ba18fb17175b9c646ce08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Feb 2022 22:05:04 +0000
Subject: [PATCH 426/767] Bump puma from 5.6.1 to 5.6.2

Bumps [puma](https://github.com/puma/puma) from 5.6.1 to 5.6.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.1...v5.6.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e392616a..e1641656 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -169,7 +169,7 @@ GEM
     parser (3.1.0.0)
       ast (~> 2.4.1)
     pg (1.3.1)
-    puma (5.6.1)
+    puma (5.6.2)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)

From 6aaf56dfe52a6e4dff509e8e078089f7d5150f45 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sun, 20 Feb 2022 19:28:51 +0200
Subject: [PATCH 427/767] Minor upgrade to Rails

---
 Gemfile.lock | 104 +++++++++++++++++++++++++--------------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68fd9998..cf0a1cf8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,26 +4,26 @@ GEM
     RedCloth (4.3.2)
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.0.4.4)
-      actionpack (= 6.0.4.4)
+    actioncable (6.0.4.6)
+      actionpack (= 6.0.4.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activejob (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
-      activestorage (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
+    actionmailbox (6.0.4.6)
+      actionpack (= 6.0.4.6)
+      activejob (= 6.0.4.6)
+      activerecord (= 6.0.4.6)
+      activestorage (= 6.0.4.6)
+      activesupport (= 6.0.4.6)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      actionview (= 6.0.4.4)
-      activejob (= 6.0.4.4)
+    actionmailer (6.0.4.6)
+      actionpack (= 6.0.4.6)
+      actionview (= 6.0.4.6)
+      activejob (= 6.0.4.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.4)
-      actionview (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
+    actionpack (6.0.4.6)
+      actionview (= 6.0.4.6)
+      activesupport (= 6.0.4.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
@@ -31,36 +31,36 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
-      activestorage (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
+    actiontext (6.0.4.6)
+      actionpack (= 6.0.4.6)
+      activerecord (= 6.0.4.6)
+      activestorage (= 6.0.4.6)
+      activesupport (= 6.0.4.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.4)
-      activesupport (= 6.0.4.4)
+    actionview (6.0.4.6)
+      activesupport (= 6.0.4.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4.4)
-      activesupport (= 6.0.4.4)
+    activejob (6.0.4.6)
+      activesupport (= 6.0.4.6)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.4)
-      activesupport (= 6.0.4.4)
+    activemodel (6.0.4.6)
+      activesupport (= 6.0.4.6)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.4.4)
-      activemodel (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
-    activestorage (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activejob (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
+    activerecord (6.0.4.6)
+      activemodel (= 6.0.4.6)
+      activesupport (= 6.0.4.6)
+    activestorage (6.0.4.6)
+      actionpack (= 6.0.4.6)
+      activejob (= 6.0.4.6)
+      activerecord (= 6.0.4.6)
       marcel (~> 1.0.0)
-    activesupport (6.0.4.4)
+    activesupport (6.0.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -112,7 +112,7 @@ GEM
       activesupport (>= 5.0)
     highline (2.0.3)
     htmlentities (4.3.4)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -145,7 +145,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.13.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -177,20 +177,20 @@ GEM
       rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4.4)
-      actioncable (= 6.0.4.4)
-      actionmailbox (= 6.0.4.4)
-      actionmailer (= 6.0.4.4)
-      actionpack (= 6.0.4.4)
-      actiontext (= 6.0.4.4)
-      actionview (= 6.0.4.4)
-      activejob (= 6.0.4.4)
-      activemodel (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
-      activestorage (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
+    rails (6.0.4.6)
+      actioncable (= 6.0.4.6)
+      actionmailbox (= 6.0.4.6)
+      actionmailer (= 6.0.4.6)
+      actionpack (= 6.0.4.6)
+      actiontext (= 6.0.4.6)
+      actionview (= 6.0.4.6)
+      activejob (= 6.0.4.6)
+      activemodel (= 6.0.4.6)
+      activerecord (= 6.0.4.6)
+      activestorage (= 6.0.4.6)
+      activesupport (= 6.0.4.6)
       bundler (>= 1.3.0)
-      railties (= 6.0.4.4)
+      railties (= 6.0.4.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -206,9 +206,9 @@ GEM
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
+    railties (6.0.4.6)
+      actionpack (= 6.0.4.6)
+      activesupport (= 6.0.4.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)

From c9845711c07a81b7c8873f67f753e18d1bd252a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 20 Feb 2022 17:44:55 +0000
Subject: [PATCH 428/767] Bump pg from 1.3.1 to 1.3.2

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 536f6302..7cf39ef2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.3', group: :mysql
-gem 'pg', '~> 1.3.1', group: :postgresql
+gem 'pg', '~> 1.3.2', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index cf0a1cf8..74151955 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
-    pg (1.3.1)
+    pg (1.3.2)
     puma (5.6.2)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -339,7 +339,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.3)
-  pg (~> 1.3.1)
+  pg (~> 1.3.2)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 580781536f22a48fd004c1b4a50807cbf58e49f5 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Wed, 9 Feb 2022 10:05:59 +0000
Subject: [PATCH 429/767] Translated using Weblate (Finnish)

Currently translated at 99.6% (1113 of 1117 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/
---
 config/locales/fi.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index da2d4bcc..2dfd76e5 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,9 +131,8 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: 1 muistiinpano
-      other: "%{count} muistiinpanoa"
-      zero: ei muistiinpanoja
+      one: ei muistiinpanoja
+      other: 1 muistiinpano
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -251,6 +250,7 @@ fi:
         file_blank: Tiedosto ei voi olla tyhjä
         some: Tuonnissa tapahtui virheitä
         invalid_destination: 'Virheellinen tuontikohde: %{e}'
+        no_context: Asiayhteyttä ei löytynyt oletusarvoksi
   date:
     abbr_day_names:
     - Su
@@ -1332,13 +1332,11 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
       single_page_html:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From ba861b326d8afa945e0e39f888a33b7d32edc806 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 21 Feb 2022 11:39:36 +0200
Subject: [PATCH 430/767] Fixed the plurals

---
 config/locales/fi.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 2dfd76e5..be14d51a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,8 +131,9 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: ei muistiinpanoja
-      other: 1 muistiinpano
+      one: 1 muistiinpano
+      other: "%{count} muistiinpanoa"
+      zero: ei muistiinpanoja
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1332,11 +1333,13 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
       single_page_html:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From 4c429b7a83d8a76ca0f0869fc595c17611a48552 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 21 Feb 2022 11:51:37 +0200
Subject: [PATCH 431/767] Version 2.6

---
 config/initializers/tracks.rb |  2 +-
 doc/CHANGELOG.md              | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb
index d3666fa7..3fd9524a 100644
--- a/config/initializers/tracks.rb
+++ b/config/initializers/tracks.rb
@@ -1,4 +1,4 @@
-tracks_version='2.5.3'
+tracks_version='2.6.0'
 # comment out next two lines if you do not want (or can not) the date of the
 # last git commit in the footer
 info=`git log --pretty=format:"%ai" -1`
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 5d788103..0b960583 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,15 +1,29 @@
 See doc/upgrading.md for the upgrade documentation!
 
-## Version 2.6
+## Version 2.6.0
 
 ## New features
 
 * Ruby 3.0 is now supported.
+* Support obsidian links in notes.
 
 ## Removed features
 
 * No longer supporting EOL Ruby 2.5
 
+### Bug fixes
+
+* Fix Docker image functionality in certain cases.
+* Lots of dependencies have been upgraded.
+* Fixed some error messages in import.
+* Fixed import in the Docker image.
+
+## Updated translations
+
+* Finnish (by maintainer Jyri-Petteri ”ZeiP” Paloposki)
+* Turkish (thanks Burak Ekseli!)
+* Spanish (thanks Francisco Serrador!)
+
 ## Version 2.5.2
 
 ### New features

From 6ca701f6fdad3fd596ce3ff2f5c33a5696613dcb Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 21 Feb 2022 12:32:08 +0200
Subject: [PATCH 432/767] Fix the Git version in the footer with the Docker
 image and change the wording.

---
 .dockerignore                     |  1 -
 Dockerfile                        |  2 ++
 app/views/shared/_footer.html.erb |  3 ++-
 config/initializers/tracks.rb     | 10 +++-------
 config/locales/cs.yml             |  3 ++-
 config/locales/de.yml             |  3 ++-
 config/locales/en.yml             |  3 ++-
 config/locales/es.yml             |  3 ++-
 config/locales/fi.yml             |  3 ++-
 config/locales/fr.yml             |  3 ++-
 config/locales/he.yml             |  3 ++-
 config/locales/nl.yml             |  3 ++-
 config/locales/ru.yml             |  3 ++-
 config/locales/tr.yml             |  3 ++-
 doc/CHANGELOG.md                  |  1 +
 15 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index d9b8002c..51d21e85 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
 .bundle
-.git
 config/database.yml
 config/site.yml
 coverage
diff --git a/Dockerfile b/Dockerfile
index d17e68ca..b770a113 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,8 @@ COPY lib /app/lib/
 COPY app /app/app/
 COPY db /app/db/
 
+COPY .git /app/.git
+
 RUN RAILS_ENV=production bundle exec rake assets:precompile
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index aac3178e..f2fb0970 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,6 +1,7 @@
 
    
   
    
-    <%= t('footer.send_feedback', :version => TRACKS_VERSION) %>
+    <%= t('footer.version', :version => TRACKS_VERSION, :revision_with_date => TRACKS_REVISION_WITH_DATE, :revision => TRACKS_REVISION) %>
+    <%= t('footer.send_feedback') %>
     
       <%= t('common.bugs')%> |
       <%= t('common.wiki')%> |
diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb
index 3fd9524a..8816d318 100644
--- a/config/initializers/tracks.rb
+++ b/config/initializers/tracks.rb
@@ -1,7 +1,3 @@
-tracks_version='2.6.0'
-# comment out next two lines if you do not want (or can not) the date of the
-# last git commit in the footer
-info=`git log --pretty=format:"%ai" -1`
-tracks_version=tracks_version + ' ('+info+')'
-
-TRACKS_VERSION=tracks_version
+TRACKS_VERSION='2.6.0'
+TRACKS_REVISION_WITH_DATE=`git log --date=format:'%Y-%m-%d' --pretty=format:"%h @ %ad" -1`
+TRACKS_REVISION=`git log --pretty=format:"%h" -1`
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 99810a25..b7f2f665 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -347,7 +347,8 @@ cs:
     select_feed_for_context: Select the feed for this context
     select_feed_for_project: Vyberte feed pro tento projekt
   footer:
-    send_feedback: Poslat zpětnou vazbu na %{version}
+    version: 'Tracks %{version} (%{revision_with_date})'
+    send_feedback: Poslat zpětnou vazbu
   helpers:
     select:
       prompt: Выберите
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 33026035..7edcf7b2 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -402,7 +402,8 @@ de:
     select_feed_for_context: Feed für diesen Kontext auswählen
     select_feed_for_project: Feed für dieses Projekt auswählen
   footer:
-    send_feedback: Senden Sie Feedback zu %{version}
+    version: 'Tracks %{version} (%{revision_with_date})'
+    send_feedback: Senden Sie Feedback
   helpers:
     select:
       prompt: Выберите
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 67613cee..f0482daf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -407,7 +407,8 @@ en:
     select_feed_for_context: Select the feed for this context
     select_feed_for_project: Select the feed for this project
   footer:
-    send_feedback: Send feedback on %{version}
+    version: 'Tracks %{version} (%{revision_with_date})'
+    send_feedback: Send feedback
   helpers:
     select:
       prompt: Please select
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 387ad0c0..17a1d58c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -402,7 +402,8 @@ es:
     select_feed_for_context: Seleccione el canal para este contexto
     select_feed_for_project: Seleccione el canal para este proyecto
   footer:
-    send_feedback: Envía comentarios sobre la %{version}
+    version: 'Tracks %{version} (%{revision_with_date})'
+    send_feedback: Envía comentarios sobre
   helpers:
     select:
       prompt: Seleccione
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index be14d51a..1d71e162 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -404,7 +404,8 @@ fi:
     select_feed_for_context: Valitse tämän asiayhteyden syöte
     select_feed_for_project: Valitse tämän projektin syöte
   footer:
-    send_feedback: Lähetä palautetta versiosta %{version}
+    version: 'Tracks %{version} (%{revision_with_date})'
+    send_feedback: Lähetä palautetta
   helpers:
     select:
       prompt: Valitse
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index cc6b6443..b65cd10f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -354,7 +354,8 @@ fr:
     select_feed_for_context: Selectionner un flux pour ce contexte
     select_feed_for_project: Selectionner le flux pour ce projet
   footer:
-    send_feedback: Envoyer un feedback sur %{version}
+    send_feedback: Envoyer un feedback
+    version: 'Tracks %{version} (%{revision_with_date})'
   helpers:
     select:
       prompt: Veuillez sélectionner
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 00894c13..990c0df7 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -304,7 +304,8 @@ he:
     select_feed_for_context: בחירת ההזנה עבור ההקשר הנתון
     select_feed_for_project: בחירת ההזנה עבור הפרוייקט
   footer:
-    send_feedback: שליחת משוב על גירסא %{version}
+    send_feedback: שליחת משוב על גירסא
+    version: 'Tracks %{version} (%{revision_with_date})'
   helpers:
     select:
       prompt: Выберите
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 5a2e9b84..b244660e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -347,7 +347,8 @@ nl:
     select_feed_for_context: Kies de feed voor deze context
     select_feed_for_project: Kies de feed voor dit project
   footer:
-    send_feedback: Stuur reactie op %{version}
+    send_feedback: Stuur reactie
+    version: 'Tracks %{version} (%{revision_with_date})'
   helpers:
     select:
       prompt: Maak een keuze
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 7ce28538..ef7e3bff 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -425,7 +425,8 @@ ru:
     select_feed_for_context: Выберите ленту новостей для этого контекста
     select_feed_for_project: Выберите ленту новостей для этого проекта
   footer:
-    send_feedback: Обратная связь. Версия %{version}
+    send_feedback: Обратная связь
+    version: 'Tracks %{version} (%{revision_with_date})'
   helpers:
     select:
       prompt: Выберите...
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 985d6948..a646b311 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -417,7 +417,8 @@ integrations:
       yazarak "çamaşırları yıka @ Ev" veya "Mehmet'i Ara > x projesi" ve benzeri türden
       görevler oluşturmak için Rich Todo API kullanabilirsiniz.
 footer:
-  send_feedback: Geri bildirim gönderin %{version}
+  send_feedback: Geri bildirim
+  version: 'Tracks %{version} (%{revision_with_date})'
 helpers:
   select:
     prompt: Seçiniz
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 0b960583..e62628cd 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -17,6 +17,7 @@ See doc/upgrading.md for the upgrade documentation!
 * Lots of dependencies have been upgraded.
 * Fixed some error messages in import.
 * Fixed import in the Docker image.
+* Footer shows the Git version hash and date in the Docker image
 
 ## Updated translations
 

From a0f0ca0c13d6ed702cd5f2f4e3c6a2ba11faf916 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 22 Feb 2022 23:11:54 +0200
Subject: [PATCH 433/767] Relax the Rubocop limits a bit to make CodeClimate
 more useful

---
 .rubocop.yml | 17 +++++++++++++++++
 Gemfile      |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8785daf6..03441c91 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,3 +16,20 @@ Style/StringLiterals:
 
 Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
+
+Metrics/AbcSize:
+  Max: 100
+Metrics/CyclomaticComplexity:
+  Max: 100
+Metrics/MethodLength:
+  Max: 100
+  CountAsOne: ['array', 'hash', 'heredoc']
+Metrics/ModuleLength:
+  Max: 300
+  CountAsOne: ['array', 'hash', 'heredoc']
+Metrics/ClassLength:
+  Max: 300
+Metrics/ParameterLists:
+  Max: 20
+Metrics/PerceivedComplexity:
+  Max: 100
diff --git a/Gemfile b/Gemfile
index 7cf39ef2..f636de24 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,8 +61,8 @@ group :test do
   gem 'codeclimate-test-reporter', '1.0.7', group: :test, require: nil
   gem 'database_cleaner'
   gem 'factory_bot_rails'
-  gem 'mocha', :require => false
   gem 'minitest-stub-const'
+  gem 'mocha', :require => false
   gem 'rails-controller-testing'
   gem 'rails-dom-testing', '~> 2.0.0'
   gem 'rspec-expectations'

From 50c6ba4e0ceb2a508cc6981c130fad4889c7eda2 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 22 Feb 2022 23:47:30 +0200
Subject: [PATCH 434/767] Also make the Codeclimate configuration a bit more
 relaxed

---
 .codeclimate.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 28469e82..9bdd8e92 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,3 +1,17 @@
+version: "2"
+checks:
+  file-lines:
+    config:
+      threshold: 300
+  method-complexity:
+    config:
+      threshold: 50
+  method-count:
+    config:
+      threshold: 20
+  method-lines:
+    config:
+      threshold: 100
 engines:
   brakeman:
     enabled: true

From a37a9088e731ec7902f202a1f2ac61129cbe1ce6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Feb 2022 00:03:12 +0000
Subject: [PATCH 435/767] Bump rack-mini-profiler from 2.3.3 to 2.3.4

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.3...v2.3.4)

---
updated-dependencies:
- dependency-name: rack-mini-profiler
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 74151955..d502acfd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
-    rack-mini-profiler (2.3.3)
+    rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)

From e703584f9f95c0db9312041dc07281b6f7772755 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Feb 2022 00:03:30 +0000
Subject: [PATCH 436/767] Bump pg from 1.3.2 to 1.3.3

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.2...v1.3.3)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index f636de24..f3ee97d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.3', group: :mysql
-gem 'pg', '~> 1.3.2', group: :postgresql
+gem 'pg', '~> 1.3.3', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 74151955..7f622af8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
-    pg (1.3.2)
+    pg (1.3.3)
     puma (5.6.2)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -339,7 +339,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.3)
-  pg (~> 1.3.2)
+  pg (~> 1.3.3)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 64a4e457dd29b974e3714d0659d75acdad55e6fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 00:02:26 +0000
Subject: [PATCH 437/767] Bump rack-mini-profiler from 2.3.4 to 3.0.0

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.4 to 3.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.4...v3.0.0)

---
updated-dependencies:
- dependency-name: rack-mini-profiler
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3d0fb0cd..f18b5113 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
-    rack-mini-profiler (2.3.4)
+    rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)

From 684ab66eba316f922dcce7421cc716f46dd030a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 26 Feb 2022 09:23:02 +0000
Subject: [PATCH 438/767] Bump nokogiri from 1.13.1 to 1.13.3

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.1 to 1.13.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.1...v1.13.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3d0fb0cd..95719f48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,14 +156,14 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     minitest-stub-const (0.6)
     mocha (1.13.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.21.0)
     parser (3.1.0.0)

From 73993cde409e2695232e1ffb1db8ae395f982a89 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 10 Mar 2022 01:48:43 +0200
Subject: [PATCH 439/767] Version bumps

---
 Gemfile.lock | 102 +++++++++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d88b821b..6abbf201 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,26 +4,26 @@ GEM
     RedCloth (4.3.2)
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.0.4.6)
-      actionpack (= 6.0.4.6)
+    actioncable (6.0.4.7)
+      actionpack (= 6.0.4.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.6)
-      actionpack (= 6.0.4.6)
-      activejob (= 6.0.4.6)
-      activerecord (= 6.0.4.6)
-      activestorage (= 6.0.4.6)
-      activesupport (= 6.0.4.6)
+    actionmailbox (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.6)
-      actionpack (= 6.0.4.6)
-      actionview (= 6.0.4.6)
-      activejob (= 6.0.4.6)
+    actionmailer (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      actionview (= 6.0.4.7)
+      activejob (= 6.0.4.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.6)
-      actionview (= 6.0.4.6)
-      activesupport (= 6.0.4.6)
+    actionpack (6.0.4.7)
+      actionview (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
@@ -31,36 +31,36 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.0.4.6)
-      actionpack (= 6.0.4.6)
-      activerecord (= 6.0.4.6)
-      activestorage (= 6.0.4.6)
-      activesupport (= 6.0.4.6)
+    actiontext (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.6)
-      activesupport (= 6.0.4.6)
+    actionview (6.0.4.7)
+      activesupport (= 6.0.4.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4.6)
-      activesupport (= 6.0.4.6)
+    activejob (6.0.4.7)
+      activesupport (= 6.0.4.7)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.6)
-      activesupport (= 6.0.4.6)
+    activemodel (6.0.4.7)
+      activesupport (= 6.0.4.7)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.4.6)
-      activemodel (= 6.0.4.6)
-      activesupport (= 6.0.4.6)
-    activestorage (6.0.4.6)
-      actionpack (= 6.0.4.6)
-      activejob (= 6.0.4.6)
-      activerecord (= 6.0.4.6)
+    activerecord (6.0.4.7)
+      activemodel (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
+    activestorage (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
       marcel (~> 1.0.0)
-    activesupport (6.0.4.6)
+    activesupport (6.0.4.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -177,20 +177,20 @@ GEM
       rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4.6)
-      actioncable (= 6.0.4.6)
-      actionmailbox (= 6.0.4.6)
-      actionmailer (= 6.0.4.6)
-      actionpack (= 6.0.4.6)
-      actiontext (= 6.0.4.6)
-      actionview (= 6.0.4.6)
-      activejob (= 6.0.4.6)
-      activemodel (= 6.0.4.6)
-      activerecord (= 6.0.4.6)
-      activestorage (= 6.0.4.6)
-      activesupport (= 6.0.4.6)
+    rails (6.0.4.7)
+      actioncable (= 6.0.4.7)
+      actionmailbox (= 6.0.4.7)
+      actionmailer (= 6.0.4.7)
+      actionpack (= 6.0.4.7)
+      actiontext (= 6.0.4.7)
+      actionview (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activemodel (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       bundler (>= 1.3.0)
-      railties (= 6.0.4.6)
+      railties (= 6.0.4.7)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -206,9 +206,9 @@ GEM
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (6.0.4.6)
-      actionpack (= 6.0.4.6)
-      activesupport (= 6.0.4.6)
+    railties (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -272,7 +272,7 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     spring (3.1.1)
-    sprockets (4.0.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)

From d64c7627a2ae8a5196de5f2243edfcac94010d23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Mar 2022 00:02:14 +0000
Subject: [PATCH 440/767] Bump rubocop from 1.25.1 to 1.26.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.25.1 to 1.26.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.25.1...v1.26.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index f3ee97d2..9500ecc3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.25', require: false
+  gem 'rubocop', '~> 1.26', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index d88b821b..a8d6b124 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -166,7 +166,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.1.0.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     pg (1.3.3)
     puma (5.6.2)
@@ -218,7 +218,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.2.0)
+    regexp_parser (2.2.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -226,17 +226,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.25.1)
+    rubocop (1.26.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
     sanitize (6.0.0)
@@ -347,7 +347,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.25)
+  rubocop (~> 1.26)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From e687e370f20722a48c6d08328ffd148ee22a74ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Mar 2022 00:02:30 +0000
Subject: [PATCH 441/767] Bump pg from 1.3.3 to 1.3.4

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.3 to 1.3.4.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.3...v1.3.4)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9500ecc3..9ebf95dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.3', group: :mysql
-gem 'pg', '~> 1.3.3', group: :postgresql
+gem 'pg', '~> 1.3.4', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index b23325f2..bad7372c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    pg (1.3.3)
+    pg (1.3.4)
     puma (5.6.2)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -339,7 +339,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.3)
-  pg (~> 1.3.3)
+  pg (~> 1.3.4)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 8bed1835823886a92fe9a49ed0cc770cfb0b26d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Mar 2022 00:03:24 +0000
Subject: [PATCH 442/767] Bump bcrypt from 3.1.16 to 3.1.17

Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.16 to 3.1.17.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.16...v3.1.17)

---
updated-dependencies:
- dependency-name: bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9ebf95dc..cbf0f1d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'uglifier', '>=1.3.0'
 
 gem 'aasm', '~> 5.2.0'
 gem 'acts_as_list'
-gem 'bcrypt', '~> 3.1.16'
+gem 'bcrypt', '~> 3.1.17'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.1"
 gem 'puma', '~> 5.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index bad7372c..0c0a0e58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     autoprefixer-rails (10.1.0.0)
       execjs
     backport (1.2.0)
-    bcrypt (3.1.16)
+    bcrypt (3.1.17)
     benchmark (0.2.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
@@ -321,7 +321,7 @@ DEPENDENCIES
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
-  bcrypt (~> 3.1.16)
+  bcrypt (~> 3.1.17)
   bootstrap-sass (= 3.4.1)
   bullet
   byebug

From 57ca7f9e269e4b3a2b1504db7f44ac8e6c64778d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 22:22:13 +0000
Subject: [PATCH 443/767] Bump puma from 5.6.2 to 5.6.4

Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bad7372c..5d108db3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -169,7 +169,7 @@ GEM
     parser (3.1.1.0)
       ast (~> 2.4.1)
     pg (1.3.4)
-    puma (5.6.2)
+    puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)

From cde0d18da93992d66cc41cf32022cf5d08f69fac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Mar 2022 22:47:32 +0000
Subject: [PATCH 444/767] Bump rubocop from 1.26.0 to 1.26.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.26.0 to 1.26.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.26.0...v1.26.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bad7372c..437b7336 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     autoprefixer-rails (10.1.0.0)
       execjs
     backport (1.2.0)
-    bcrypt (3.1.16)
+    bcrypt (3.1.17)
     benchmark (0.2.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
@@ -165,11 +165,11 @@ GEM
     nokogiri (1.13.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.21.0)
+    parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)
     pg (1.3.4)
-    puma (5.6.2)
+    puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
@@ -226,7 +226,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.26.0)
+    rubocop (1.26.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -321,7 +321,7 @@ DEPENDENCIES
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
-  bcrypt (~> 3.1.16)
+  bcrypt (~> 3.1.17)
   bootstrap-sass (= 3.4.1)
   bullet
   byebug

From 6f380e26be4f737b54ed91cf77fcf0e74da089bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Apr 2022 09:33:11 +0000
Subject: [PATCH 445/767] Bump pg from 1.3.4 to 1.3.5

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/commits)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index cbf0f1d7..3919ccd2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.3', group: :mysql
-gem 'pg', '~> 1.3.4', group: :postgresql
+gem 'pg', '~> 1.3.5', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3cdf5338..6e6945a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,10 +165,10 @@ GEM
     nokogiri (1.13.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.21.0)
+    parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    pg (1.3.4)
+    pg (1.3.5)
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -226,7 +226,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.26.0)
+    rubocop (1.26.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -339,7 +339,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.3)
-  pg (~> 1.3.4)
+  pg (~> 1.3.5)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 785e1f836a89db2299f237d53ec3a7ce1faf432b Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 7 Apr 2022 18:54:40 +0300
Subject: [PATCH 446/767] Fix rich text documentation of tickler date, which
 has always been incorrect.

---
 app/views/integrations/index.html.erb | 2 +-
 config/locales/en.yml                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/integrations/index.html.erb b/app/views/integrations/index.html.erb
index 98e4ff9d..5de4fbf9 100644
--- a/app/views/integrations/index.html.erb
+++ b/app/views/integrations/index.html.erb
@@ -73,7 +73,7 @@ mailmap:
     <<%= I18n.t 'integrations.email_rich.field_descriptions.due_date' %>
   
   
-    ><%= I18n.t 'integrations.email_rich.field_descriptions.due_date' %>
+    ><%= I18n.t 'integrations.email_rich.field_descriptions.tickler_date' %>
   
   
     #<%= I18n.t 'integrations.email_rich.field_descriptions.tag' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f0482daf..4bace842 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -494,6 +494,8 @@ en:
         project: The project to place the Todo in
         due_date: The due date for the Todo (may be 2 digits for day, 4 digits for
           month-day, or 6 digits for year-month-day)
+        tickler_date: The tickler date for the Todo (may be 2 digits for day, 4 digits for
+          month-day, or 6 digits for year-month-day)
         tag: A tag to apply to the Todo – may be used multiple times
         star: Flag to star the Todo
     example_names:

From 21c5371116c8b12fcd0ddc3041696e1246bb78d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Apr 2022 16:44:53 +0000
Subject: [PATCH 447/767] Bump i18n-tasks from 0.9.37 to 1.0.8

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.37 to 1.0.8.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.37...v1.0.8)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  4 ++--
 Gemfile.lock | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index cbf0f1d7..d8061b15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.3', group: :mysql
-gem 'pg', '~> 1.3.4', group: :postgresql
+gem 'pg', '~> 1.3.5', group: :postgresql
 
 group :development do
   gem 'spring'
@@ -46,7 +46,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 0.9.37'
+  gem 'i18n-tasks', '~> 1.0.8'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 437b7336..67b113e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,6 +74,14 @@ GEM
     backport (1.2.0)
     bcrypt (3.1.17)
     benchmark (0.2.0)
+    better_html (1.0.16)
+      actionview (>= 4.0)
+      activesupport (>= 4.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      html_tokenizer (~> 0.0.6)
+      parser (>= 2.4)
+      smart_properties
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
@@ -92,7 +100,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     database_cleaner (1.8.5)
     diff-lcs (1.5.0)
@@ -111,12 +119,14 @@ GEM
     globalid (1.0.0)
       activesupport (>= 5.0)
     highline (2.0.3)
+    html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.37)
+    i18n-tasks (1.0.8)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
+      better_html (~> 1.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -145,7 +155,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.14.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -168,7 +178,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    pg (1.3.4)
+    pg (1.3.5)
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -201,7 +211,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rails-i18n (7.0.1)
+    rails-i18n (7.0.3)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.6)
@@ -256,6 +266,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
+    smart_properties (1.17.0)
     solargraph (0.44.3)
       backport (~> 1.2)
       benchmark
@@ -331,7 +342,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 5.15.1)
   htmlentities
-  i18n-tasks (~> 0.9.37)
+  i18n-tasks (~> 1.0.8)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)
@@ -339,7 +350,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.3)
-  pg (~> 1.3.4)
+  pg (~> 1.3.5)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 7435979cb9e5f492ea237fec25c7abeb6643371d Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 7 Apr 2022 19:48:37 +0300
Subject: [PATCH 448/767] Fix rich text help to specify that subject is used

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4bace842..9b8efd03 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -483,7 +483,7 @@ en:
           \ and home email accounts to your Tracks Mailgun route, set it up like this:\
           \ %{code}"
     email_rich:
-      description: "For both of the above methods, the follow format can be used:"
+      description: "For both of the above methods, the following format can be used in the message subject to add metadata:"
       fields_title: "The fields are:"
       symbol_title: Symbol
       meaning_title: Meaning

From 2bf00960e29a7b2a95b2b04b626adb6a1ac29ad0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Apr 2022 17:03:42 +0000
Subject: [PATCH 449/767] Bump tolk from 4.1.1 to 4.3.0

Bumps [tolk](https://github.com/tolk/tolk) from 4.1.1 to 4.3.0.
- [Release notes](https://github.com/tolk/tolk/releases)
- [Changelog](https://github.com/tolk/tolk/blob/v4.3.0/CHANGELOG.md)
- [Commits](https://github.com/tolk/tolk/compare/v4.1.1...v4.3.0)

---
updated-dependencies:
- dependency-name: tolk
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  4 ++--
 Gemfile.lock | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3919ccd2..7cc9b0ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,13 +40,13 @@ group :development do
   gem 'spring'
   gem 'yard'
 
-  gem 'tolk', '~> 4.1.1'
+  gem 'tolk', '~> 4.3.0'
 
   gem 'bullet'
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 0.9.37'
+  gem 'i18n-tasks', '~> 1.0.8'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e6945a0..ad1c0d38 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,6 +74,14 @@ GEM
     backport (1.2.0)
     bcrypt (3.1.17)
     benchmark (0.2.0)
+    better_html (1.0.16)
+      actionview (>= 4.0)
+      activesupport (>= 4.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      html_tokenizer (~> 0.0.6)
+      parser (>= 2.4)
+      smart_properties
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
@@ -92,7 +100,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     database_cleaner (1.8.5)
     diff-lcs (1.5.0)
@@ -111,12 +119,14 @@ GEM
     globalid (1.0.0)
       activesupport (>= 5.0)
     highline (2.0.3)
+    html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.37)
+    i18n-tasks (1.0.8)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
+      better_html (~> 1.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -145,7 +155,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.14.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -201,7 +211,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rails-i18n (7.0.1)
+    rails-i18n (7.0.3)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.6)
@@ -256,6 +266,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
+    smart_properties (1.17.0)
     solargraph (0.44.3)
       backport (~> 1.2)
       benchmark
@@ -290,7 +301,7 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tolk (4.1.1)
+    tolk (4.3.0)
       rails (>= 5.0)
       safe_yaml (>= 0.8.6)
       sassc
@@ -331,7 +342,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 5.15.1)
   htmlentities
-  i18n-tasks (~> 0.9.37)
+  i18n-tasks (~> 1.0.8)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)
@@ -355,7 +366,7 @@ DEPENDENCIES
   spring
   sqlite3
   therubyracer
-  tolk (~> 4.1.1)
+  tolk (~> 4.3.0)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)
   will_paginate

From 4ffa5d8b47cf2ff5c996a7ec18161fbb8befdf9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 00:06:25 +0000
Subject: [PATCH 450/767] Bump i18n-tasks from 1.0.8 to 1.0.9

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.8...v1.0.9)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7cc9b0ab..530224ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 1.0.8'
+  gem 'i18n-tasks', '~> 1.0.9'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index ad1c0d38..bf0b0e0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,7 +123,7 @@ GEM
     htmlentities (4.3.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.8)
+    i18n-tasks (1.0.9)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       better_html (~> 1.0)
@@ -342,7 +342,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 5.15.1)
   htmlentities
-  i18n-tasks (~> 1.0.8)
+  i18n-tasks (~> 1.0.9)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)

From 212bdf8d821d15d7bab63ccee2fd9d26b0385d1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 10:12:37 +0000
Subject: [PATCH 451/767] Bump nokogiri from 1.13.3 to 1.13.4

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ad1c0d38..284bbcae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
     mocha (1.13.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)

From f4415c6221071c02c05db716c609f130b80ba0d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 00:02:36 +0000
Subject: [PATCH 452/767] Bump rubocop from 1.26.1 to 1.27.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.26.1 to 1.27.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.26.1...v1.27.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 530224ef..8dc275fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.26', require: false
+  gem 'rubocop', '~> 1.27', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 343410b9..8d70f7e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -176,7 +176,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.1.0)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.3.5)
     puma (5.6.4)
@@ -228,7 +228,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.2.1)
+    regexp_parser (2.3.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -236,7 +236,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.26.1)
+    rubocop (1.27.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -245,7 +245,7 @@ GEM
       rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
@@ -358,7 +358,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.26)
+  rubocop (~> 1.27)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From f0f57182914aaf570d6538a0656dd505bb1b01e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Apr 2022 00:03:14 +0000
Subject: [PATCH 453/767] Bump rubocop from 1.27.0 to 1.28.2

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.27.0 to 1.28.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.27.0...v1.28.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8dc275fe..421df56e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.27', require: false
+  gem 'rubocop', '~> 1.28', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d70f7e0..b51010dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -228,7 +228,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.3.0)
+    regexp_parser (2.3.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -236,13 +236,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.27.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.17.0)
@@ -358,7 +358,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.27)
+  rubocop (~> 1.28)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From d52893bc589f5d6a28975c0ea71cc7035f32a2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Koutn=C3=BD?= 
Date: Fri, 29 Apr 2022 02:43:08 +0200
Subject: [PATCH 454/767] Allow autocompletion behind proxy

When the application is exposed via proxy, i.e. client visible host
(e.g. example.org:443) is different than Ruby server (e.g.
localhost:3000), autocompletion does not work since the generated URLs
refer to the internal hostname.

The AJAX is constructed with root_url and that can be modified with
default_url_options. So the simple fix just allows specifying customized
default_url_options.

Fixes: #1416
---
 config/application.rb | 2 ++
 config/site.yml.tmpl  | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/config/application.rb b/config/application.rb
index 9d8c9e82..45018052 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -35,5 +35,7 @@ module Tracksapp
 
     # configure Tracks to handle deployment in a subdir
     config.relative_url_root = SITE_CONFIG['subdir'] if SITE_CONFIG['subdir']
+    # or deployment behind a proxy
+    config.action_controller.default_url_options = SITE_CONFIG['default_url_options'] if SITE_CONFIG['default_url_options']
   end
 end
diff --git a/config/site.yml.tmpl b/config/site.yml.tmpl
index c648632d..283ae60b 100644
--- a/config/site.yml.tmpl
+++ b/config/site.yml.tmpl
@@ -39,6 +39,13 @@ force_ssl: false
 # the relative URL. Mongrel, for example, has a --prefix option.
 # subdir: "/tracks"
 
+# Set this to respective values if you're instance is running behind a proxy
+# (e.g. localhost:3000 is not the client visible host).
+# default_url_options:
+#   :host: 'example.org'
+#   :protocol: 'https://'
+#   :port: 443
+
 # Set to true to allow anyone to sign up for a username.
 open_signups: false
 

From f801a5ed938bf02e5d7c5aff7650ec557b6fa5b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 10:16:51 +0000
Subject: [PATCH 455/767] Bump mocha from 1.13.0 to 1.14.0

Bumps [mocha](https://github.com/freerange/mocha) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/freerange/mocha/releases)
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v1.13.0...v1.14.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8d70f7e0..38d7c0a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -169,7 +169,7 @@ GEM
     mini_portile2 (2.8.0)
     minitest (5.15.0)
     minitest-stub-const (0.6)
-    mocha (1.13.0)
+    mocha (1.14.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
     nokogiri (1.13.4)
@@ -228,7 +228,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.3.0)
+    regexp_parser (2.3.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -236,13 +236,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.27.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.17.0)
@@ -358,7 +358,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.27)
+  rubocop (~> 1.28)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From af6819b9adbd1cd0dd20c38399a2bfbede3a30d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 07:43:30 +0000
Subject: [PATCH 456/767] Bump i18n-tasks from 1.0.9 to 1.0.10

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.9 to 1.0.10.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.9...v1.0.10)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 421df56e..4fa8bf90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 1.0.9'
+  gem 'i18n-tasks', '~> 1.0.10'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index b51010dd..a3fbc107 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,7 +123,7 @@ GEM
     htmlentities (4.3.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.9)
+    i18n-tasks (1.0.10)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       better_html (~> 1.0)
@@ -155,7 +155,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.16.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -169,10 +169,10 @@ GEM
     mini_portile2 (2.8.0)
     minitest (5.15.0)
     minitest-stub-const (0.6)
-    mocha (1.13.0)
+    mocha (1.14.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.13.4)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -342,7 +342,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 5.15.1)
   htmlentities
-  i18n-tasks (~> 1.0.9)
+  i18n-tasks (~> 1.0.10)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)

From 3fdc3eb5202cedde6917ddb34f4230e7f6015572 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 May 2022 03:42:33 +0000
Subject: [PATCH 457/767] Bump nokogiri from 1.13.4 to 1.13.6

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.4 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.4...v1.13.6)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 38d7c0a9..d9d17ac9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
     mocha (1.14.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.13.4)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)

From 6a0bfb0a1a537bc53ba00fa225df34e446708568 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 May 2022 22:04:43 +0000
Subject: [PATCH 458/767] Bump rack from 2.2.3 to 2.2.3.1

Bumps [rack](https://github.com/rack/rack) from 2.2.3 to 2.2.3.1.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.2.3...2.2.3.1)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a3fbc107..1fb64fce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (1.1.0)

From 57b8e996a5dcf8538bb88f7ebcb32e1fb7e74a33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 May 2022 00:07:42 +0000
Subject: [PATCH 459/767] Bump mysql2 from 0.5.3 to 0.5.4

Bumps [mysql2](https://github.com/brianmario/mysql2) from 0.5.3 to 0.5.4.
- [Release notes](https://github.com/brianmario/mysql2/releases)
- [Commits](https://github.com/brianmario/mysql2/compare/0.5.3...0.5.4)

---
updated-dependencies:
- dependency-name: mysql2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4fa8bf90..872b3e99 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem 'therubyracer', group: :therubyracer
 
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
-gem 'mysql2', '~> 0.5.3', group: :mysql
+gem 'mysql2', '~> 0.5.4', group: :mysql
 gem 'pg', '~> 1.3.5', group: :postgresql
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 1fb64fce..c7f23b5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,7 +170,7 @@ GEM
     minitest (5.15.0)
     minitest-stub-const (0.6)
     mocha (1.14.0)
-    mysql2 (0.5.3)
+    mysql2 (0.5.4)
     nio4r (2.5.8)
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
@@ -349,7 +349,7 @@ DEPENDENCIES
   listen
   minitest-stub-const
   mocha
-  mysql2 (~> 0.5.3)
+  mysql2 (~> 0.5.4)
   pg (~> 1.3.5)
   puma (~> 5.6)
   rack-mini-profiler

From e00836875d870a1bae78afc2875b1db9ef61e5bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Jul 2022 09:05:24 +0000
Subject: [PATCH 460/767] Bump rails-html-sanitizer from 1.4.2 to 1.4.3

Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.2...v1.4.3)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c7f23b5a..bfb4c033 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rails-i18n (7.0.3)
       i18n (>= 0.7, < 2)

From d2cd74f9e36d23bd89afaf20786ac1d644dda11d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Jul 2022 00:03:28 +0000
Subject: [PATCH 461/767] Bump rubocop from 1.28.2 to 1.32.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.28.2 to 1.32.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.28.2...v1.32.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 872b3e99..48d01ca1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.28', require: false
+  gem 'rubocop', '~> 1.32', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c7f23b5a..41aa72bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,6 +141,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
+    json (2.6.2)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -228,7 +229,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.3.1)
+    regexp_parser (2.5.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -236,16 +237,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.28.2)
+    rubocop (1.32.0)
+      json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.19.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.19.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
@@ -312,7 +314,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     uniform_notifier (1.14.2)
     webrick (1.7.0)
     websocket-driver (0.7.5)
@@ -358,7 +360,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.28)
+  rubocop (~> 1.32)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 1e6794ad09abf93a2969de1c32fc9dafa02e33ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Jul 2022 08:26:15 +0000
Subject: [PATCH 462/767] Bump tzinfo from 1.2.9 to 1.2.10

Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.9 to 1.2.10.
- [Release notes](https://github.com/tzinfo/tzinfo/releases)
- [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md)
- [Commits](https://github.com/tzinfo/tzinfo/compare/v1.2.9...v1.2.10)

---
updated-dependencies:
- dependency-name: tzinfo
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c7f23b5a..889668fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -308,7 +308,7 @@ GEM
       sprockets-rails (~> 3.4)
     tracks-chartjs-ror (3.6.4)
       rails (>= 3.1)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)

From 4eabdb1a831103f15d35b7c97a396d68d1fa2958 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sat, 23 Jul 2022 12:40:51 +0300
Subject: [PATCH 463/767] Fix the recurring year tests

---
 test/models/recurring_todo_test.rb | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/test/models/recurring_todo_test.rb b/test/models/recurring_todo_test.rb
index e6535f14..7779307e 100644
--- a/test/models/recurring_todo_test.rb
+++ b/test/models/recurring_todo_test.rb
@@ -107,7 +107,6 @@ class RecurringTodoTest < ActiveSupport::TestCase
   def test_start_from_in_future
 
     ## Test: every day
-
     # every_day should return start_day if it is in the future
     @every_day.start_from = @in_three_days
     due_date = @every_day.get_due_date(nil)
@@ -120,18 +119,14 @@ class RecurringTodoTest < ActiveSupport::TestCase
     due_date = @every_day.get_due_date(@in_four_days)
     assert_equal (@in_four_days+1.day).at_midnight, due_date
 
-    
     ## Test: Every weekday
-
     # 1 Jan 2020 is a Wednesday
     @weekly_every_day.start_from = Time.zone.local(2020,1,1)
     assert_equal Time.zone.local(2020,1,1), @weekly_every_day.get_due_date(nil)
     assert_equal Time.zone.local(2020,1,1), @weekly_every_day.get_due_date(Time.zone.local(2019,10,1))
     assert_equal Time.zone.local(2020,1,10), @weekly_every_day.get_due_date(Time.zone.local(2020,1,9))
 
-
     ## Test: every month
-
     @monthly_every_last_friday.start_from = Time.zone.local(@next_year,3,1)
 
     last_friday_in_march = Time.zone.local(@next_year, 3, 31)
@@ -152,16 +147,17 @@ class RecurringTodoTest < ActiveSupport::TestCase
     # Starting from 1 April next year: next due date is the last Friday of April
     assert_equal last_friday_in_april, @monthly_every_last_friday.get_due_date(Time.zone.local(@next_year,4,1))
 
-
     ## Test: every year
-
-    # start from after june 8th 2008
-    @yearly.start_from = Time.zone.local(2021,6,12)
-    assert_equal Time.zone.local(2022,6,8), @yearly.get_due_date(nil) # jun 8th next year
-    assert_equal Time.zone.local(2022,6,8), @yearly.get_due_date(Time.zone.local(2019,6,1)) # also next year
-    assert_equal Time.zone.local(2022,6,8), @yearly.get_due_date(Time.zone.local(2020,6,15)) # also next year
-
     this_year = Time.zone.now.utc.year
+    next_year = this_year + 1
+
+    # Test that we're getting the next due date both without a specific date,
+    # after this year and after the next year's.
+    @yearly.start_from = Time.zone.local(this_year, 6, 12)
+    assert_equal Time.zone.local(next_year, 6, 8), @yearly.get_due_date(nil) # jun 8th next year
+    assert_equal Time.zone.local(next_year, 6, 8), @yearly.get_due_date(Time.zone.local(next_year, 6, 1)) # also next year
+    assert_equal Time.zone.local(next_year + 1, 6, 8), @yearly.get_due_date(Time.zone.local(next_year, 6, 15)) # also next year
+
     @yearly.start_from = Time.zone.local(this_year+1,6,12)
     due_date = @yearly.get_due_date(nil)
     assert_equal due_date.year, this_year+2

From c1ad402a70e934d7359df1bb1c63588aeda9d913 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Jul 2022 00:41:38 +0000
Subject: [PATCH 464/767] Bump pg from 1.3.5 to 1.4.1

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.5 to 1.4.1.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.5...v1.4.1)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  4 ++--
 Gemfile.lock | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 872b3e99..5cab830c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.4', group: :mysql
-gem 'pg', '~> 1.3.5', group: :postgresql
+gem 'pg', '~> 1.4.1', group: :postgresql
 
 group :development do
   gem 'spring'
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.28', require: false
+  gem 'rubocop', '~> 1.32', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c7f23b5a..27243992 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,6 +141,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
+    json (2.6.2)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -178,7 +179,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.3.5)
+    pg (1.4.1)
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -228,7 +229,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.3.1)
+    regexp_parser (2.5.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -236,16 +237,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.28.2)
+    rubocop (1.32.0)
+      json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.19.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.19.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
@@ -308,11 +310,11 @@ GEM
       sprockets-rails (~> 3.4)
     tracks-chartjs-ror (3.6.4)
       rails (>= 3.1)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     uniform_notifier (1.14.2)
     webrick (1.7.0)
     websocket-driver (0.7.5)
@@ -350,7 +352,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.4)
-  pg (~> 1.3.5)
+  pg (~> 1.4.1)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)
@@ -358,7 +360,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.28)
+  rubocop (~> 1.32)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 5ad0f577799d2f149cbcefbbe42cdfb1a51f39b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Jul 2022 00:02:23 +0000
Subject: [PATCH 465/767] Bump bcrypt from 3.1.17 to 3.1.18

Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.17 to 3.1.18.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.17...v3.1.18)

---
updated-dependencies:
- dependency-name: bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5cab830c..18af4c44 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'uglifier', '>=1.3.0'
 
 gem 'aasm', '~> 5.2.0'
 gem 'acts_as_list'
-gem 'bcrypt', '~> 3.1.17'
+gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.1"
 gem 'puma', '~> 5.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index d085469a..5a44a415 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     autoprefixer-rails (10.1.0.0)
       execjs
     backport (1.2.0)
-    bcrypt (3.1.17)
+    bcrypt (3.1.18)
     benchmark (0.2.0)
     better_html (1.0.16)
       actionview (>= 4.0)
@@ -334,7 +334,7 @@ DEPENDENCIES
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
-  bcrypt (~> 3.1.17)
+  bcrypt (~> 3.1.18)
   bootstrap-sass (= 3.4.1)
   bullet
   byebug

From 069ec8b778c8e8ec33466e3579c8406ccff9993a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 20:25:16 +0000
Subject: [PATCH 466/767] Bump bullet from 7.0.1 to 7.0.2

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.1...7.0.2)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d085469a..003c2a05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     autoprefixer-rails (10.1.0.0)
       execjs
     backport (1.2.0)
-    bcrypt (3.1.17)
+    bcrypt (3.1.18)
     benchmark (0.2.0)
     better_html (1.0.16)
       actionview (>= 4.0)
@@ -86,7 +86,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.0.1)
+    bullet (7.0.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -121,7 +121,7 @@ GEM
     highline (2.0.3)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.10)
       activesupport (>= 4.0.2)
@@ -168,7 +168,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     minitest-stub-const (0.6)
     mocha (1.14.0)
     mysql2 (0.5.4)
@@ -315,7 +315,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.2.0)
-    uniform_notifier (1.14.2)
+    uniform_notifier (1.16.0)
     webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -323,7 +323,7 @@ GEM
     will_paginate (3.3.1)
     yard (0.9.27)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -334,7 +334,7 @@ DEPENDENCIES
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
-  bcrypt (~> 3.1.17)
+  bcrypt (~> 3.1.18)
   bootstrap-sass (= 3.4.1)
   bullet
   byebug

From 4b12a34cce5aa36adda59c8272f4440053fda0bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:02:33 +0000
Subject: [PATCH 467/767] Bump i18n-tasks from 1.0.10 to 1.0.11

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.10...v1.0.11)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 18af4c44..842e09a1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 1.0.10'
+  gem 'i18n-tasks', '~> 1.0.11'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a44a415..82cfa01f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.0.1)
+    bullet (7.0.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -121,9 +121,9 @@ GEM
     highline (2.0.3)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.10)
+    i18n-tasks (1.0.11)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       better_html (~> 1.0)
@@ -168,12 +168,12 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     minitest-stub-const (0.6)
     mocha (1.14.0)
     mysql2 (0.5.4)
     nio4r (2.5.8)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -183,11 +183,11 @@ GEM
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails (6.0.4.7)
       actioncable (= 6.0.4.7)
       actionmailbox (= 6.0.4.7)
@@ -212,7 +212,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    rails-i18n (7.0.3)
+    rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.6)
@@ -315,7 +315,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.2.0)
-    uniform_notifier (1.14.2)
+    uniform_notifier (1.16.0)
     webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -323,7 +323,7 @@ GEM
     will_paginate (3.3.1)
     yard (0.9.27)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -344,7 +344,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 5.15.1)
   htmlentities
-  i18n-tasks (~> 1.0.10)
+  i18n-tasks (~> 1.0.11)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)

From 0e6f637ca8b8fe8fae450d27e66fae33e350b807 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 7 Apr 2022 16:51:51 +0000
Subject: [PATCH 468/767] Translated using Weblate (Finnish)

Currently translated at 99.6% (1115 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/
---
 config/locales/fi.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 1d71e162..cf753060 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,9 +131,8 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: 1 muistiinpano
-      other: "%{count} muistiinpanoa"
-      zero: ei muistiinpanoja
+      one: ei muistiinpanoja
+      other: 1 muistiinpano
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -455,6 +454,9 @@ fi:
           määrittämiseksi näissä järjestyksissä)
         project: Projekti, johon toimenpide liitetään
         context: Konteksti, johon toimenpide liitetään
+        tickler_date: Toimenpiteen näyttöajankohta (2 numeroa pelkän päivän määrittämiseksi,
+          4 numeroa kuukauden ja päivän tai 6 numeroa vuoden, kuukauden ja päivän
+          määrittämiseksi näissä järjestyksissä)
       fields_instruction: Kaikki merkinnät ovat valinnaisia. Tekstiä ensimmäiseen
         merkintään asti käytetään toimenpiteen kuvauksena
       meaning_title: Tarkoitus
@@ -1334,13 +1336,11 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
       single_page_html:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From de74f9c71aed2019384d1c799be6e5b6545ca55b Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 7 Apr 2022 17:05:50 +0000
Subject: [PATCH 469/767] Translated using Weblate (Finnish)

Currently translated at 99.6% (1115 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/
---
 config/locales/fi.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index cf753060..be6931d7 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -462,7 +462,8 @@ fi:
       meaning_title: Tarkoitus
       symbol_title: Merkintä
       fields_title: 'Kentät:'
-      description: 'Molemmilla ylläolevilla tavoilla voidaan käyttää seuraavaa muotoilua:'
+      description: 'Molemmilla ylläolevilla tavoilla voidaan käyttää viestin otsikossa
+        seuraavaa muotoilua tietojen lisäämiseen:'
     message_gateway:
       instructions:
         '3': Lähetä sähköposti juuri asettamaasi osoitteeseen!

From 943c7907d023c60468a24431718e58a15303edb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= 
Date: Sat, 16 Apr 2022 00:23:36 +0000
Subject: [PATCH 470/767] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 0.7% (8 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/nb_NO/
---
 config/locales/nb_NO.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/locales/nb_NO.yml b/config/locales/nb_NO.yml
index 0967ef42..da706cc1 100644
--- a/config/locales/nb_NO.yml
+++ b/config/locales/nb_NO.yml
@@ -1 +1,4 @@
-{}
+activerecord:
+  attributes:
+    note:
+      created_at: Opprettet

From 070cf4ef32ef1676b6310b8e199626edeb7f4fc6 Mon Sep 17 00:00:00 2001
From: Francisco Serrador 
Date: Sat, 21 May 2022 12:46:31 +0000
Subject: [PATCH 471/767] Translated using Weblate (Spanish)

Currently translated at 89.0% (996 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/es/
---
 config/locales/es.yml | 205 +++++++++++++++++++++---------------------
 1 file changed, 105 insertions(+), 100 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 17a1d58c..46003675 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -98,9 +98,8 @@ es:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tarea
-      other: tareas
-      zero: tareas
+      one: tareas
+      other: tarea
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -132,9 +131,8 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 1 nota
-      other: "%{count} notas"
-      zero: 0 notas
+      one: 0 notas
+      other: 1 nota
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -203,23 +201,29 @@ es:
   data:
     import:
       errors:
-        invalid_destination: ""
+        invalid_destination: "Destino de importación no válido: %{e}"
         some: Han ocurrido algunos errores durante la importación
-        file_blank: ''
-        invalid_csv: ""
-        save_error: ""
-      map_title: ''
+        file_blank: 'Archivo no puede estar en blanco'
+        invalid_csv: "CSV inválido: no pudo leer cabeceras: %{e}"
+        save_error: "No pudo guardar CSV subido (%{path_and_file}). Puede hacer un\
+          \ seguimiento de escritura al directorio de la subida? %{e}"
+        no_context: No pudo encontrar un contexto predeterminado
+      map_title: 'Asocia campos a ser importados'
       header: Importando datos
       submit: Importar
       successful: Importación se realizó correctamente.
       target_field: "Import to:"
       upload: Subir
-      upload_csv: ''
+      upload_csv: 'Suba su archivo CSV'
       projects_count: "%{count} proyectos importados"
       todos_count: "%{count} pendientes importados"
-      yaml_disabled: ""
-      yaml_warning: ""
-      paste_field: ""
+      yaml_disabled: "Carga YAML deshabilitada"
+      yaml_warning: "%{warning}: todos sus datos actuales serán destruidos antes de\
+        \ importar el archivo YAML, por lo que si tiene acceso a la base de datos,\
+        \ le recomendamos encarecidamente respaldar la base de dato ahora mismo, por\
+        \ si algo pueda salir mal."
+      paste_field: "Pegue el contenido del archivo YAML que ha exportado a la caja\
+        \ de texto de abajo:"
       warning: Aviso
     export:
       page_title: Tracks::Export
@@ -299,7 +303,10 @@ es:
     - Octubre
     - Noviembre
     - Diciembre
-    order: "[:year, :month, :day]"
+    order:
+    - :año
+    - :mes
+    - :día
   datetime:
     distance_in_words:
       about_x_hours:
@@ -316,13 +323,11 @@ es:
         other: Casi %{count} años
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de un minuto
-        other: menos de %{count} minutos
-        zero: menos de 1 minuto
+        one: menos de 1 minuto
+        other: menos de un minuto
       less_than_x_seconds:
         one: menos de 1 segundo
-        other: menos de %{count} segundos
-        zero: menos de 1 segundo
+        other: menos de 1 segundo
       over_x_years:
         one: más de un año
         other: en %{count} años
@@ -413,17 +418,20 @@ es:
       update: Actualizar %{model}
   integrations:
     opensearch_description: Buscar en las Pistas
+    sections:
+      message_gateway: Integre Seguimientos con un servidor de correo para ser capaz
+        de enviar una acción a través del correo a los Seguimientos
+      mailgun: Enviar correos a los Seguimientos con Mailgun
   help:
     title: Help
     usage: ''
     manual_link_text: User manual
     bugs: ''
     issue_link_text: ''
-    contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link}
-      for further information. You can also come discuss with the community:'
+    contribute: ''
     contribute_link_text: project website
     mailing_list_link_text: Mailing list
-    irc_bullet: '%{irc_link} (also available in %{matrix_link})'
+    irc_bullet: '%{irc_link} (también disponible en %{matrix_link})'
     irc_link_text: 'IRC channel #Tracks@FreeNode'
     matrix_link_text: Matriz
   layouts:
@@ -440,7 +448,7 @@ es:
       tickler: Recordatorio
     navigation:
       admin: Admin
-      api_docs: REST API Docs
+      api_docs: ''
       calendar: Calendario
       calendar_title: Calendario de las acciones pendientes
       completed_tasks: Hecho
@@ -462,7 +470,7 @@ es:
       integrations_: Pistas Integradas
       manage_users: Administrar usuarios
       manage_users_title: Añadir o eliminar usuarios
-      mobile: Mobile Site
+      mobile: ''
       notes_title: Mostrar todas las notas
       options: Opciones
       organize: Organizar
@@ -483,34 +491,34 @@ es:
       tickler: Recordatorio
       tickler_title: Recordatorio
       view: Ver
-    next_actions_rss_feed: RSS feed of next actions
+    next_actions_rss_feed: ''
     toggle_contexts: Conmuta contextos colapsados
     toggle_contexts_title: Hacer que los contextos colapsados sea (in)visibles
     toggle_notes: Conmuta anotaciones
     toggle_notes_title: Conmuta todas las anotaciones
   login:
     account_login: Acceso a la cuenta
-    cas_create_account: If you like to request on please go here to %{signup_link}
-    cas_logged_in_greeting: Hello, %{username}! You are authenticated.
-    cas_login: CAS Login
-    cas_no_user_found: Hello, %{username}! You do not have an account on Tracks.
+    cas_create_account: ''
+    cas_logged_in_greeting: ''
+    cas_login: ''
+    cas_no_user_found: ''
     cas_signup_link: Solicitar cuenta
     cas_username_not_found: Disculpe, ningún usuario por esa id de usuario CAS existe
       (%{username})
-    log_in_again: log in again.
-    logged_out: You have been logged out of Tracks.
-    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"
-    openid_identity_url_not_found: Sorry, no user by that identity URL exists (%{identity_url})
+    log_in_again: ''
+    logged_out: ''
+    login_cas: ''
+    login_standard: ''
+    login_with_openid: ''
+    mobile_use_openid: ""
+    openid_identity_url_not_found: ''
     option_separator: o,
-    please_login: Please log in to use Tracks
-    session_time_out: Session has timed out. Please %{link}
-    session_will_expire: session will expire after %{hours} hour(s) of inactivity.
+    please_login: ''
+    session_time_out: ''
+    session_will_expire: ''
     session_will_not_expire: sesión no caducada.
     sign_in: Entrar
-    signup_prompt: Want to create an account?
+    signup_prompt: ''
     successful: Has entrado correctamente. ¡Bienvenido de nuevo!
     successful_with_session_info: 'Entrada correcta:'
     unsuccessful: Entrada incorrecta.
@@ -533,19 +541,18 @@ es:
     user:
       error_context_not_associated: ID de contexto %{context} no asociado con el id
         %{user} del usuario.
-      error_project_not_associated: Project id %{project} not associated with user
-        id %{user}.
+      error_project_not_associated: ''
   notes:
-    delete_confirmation: Are you sure that you want to delete the note '%{id}'?
+    delete_confirmation: ''
     delete_item_title: Delete item
     delete_note_confirm: Are you sure that you want to delete the note '%{id}'?
     delete_note_title: Delete the note '%{id}'
     deleted_note: Deleted note '%{id}'
     edit_item_title: Edit item
     in_project: 'En: '
-    no_notes_available: 'Currently there are no notes: add notes to projects from
-      individual project pages.'
-    note_header: Note %{id}
+    no_notes_available: 'Ahora no hay notas: agregue notas a proyectos desde páginas
+      de proyecto individuales.'
+    note_header: Nota %{id}
     note_link_title: Mostrar nota %{id}
     note_location_link: 'En:'
     save_status_message: Nota %{id} fue guardada
@@ -558,14 +565,14 @@ es:
         precision: '2'
         separator: "."
         significant: Significant
-        strip_insignificant_zeros: Strip insignificant zeros
+        strip_insignificant_zeros: Recorta ceros insignificantes
         unit: "€"
     format:
       delimiter: ","
       precision: '3'
       separator: "."
-      significant: Significant
-      strip_insignificant_zeros: Strip insignificant zeros
+      significant: Significante
+      strip_insignificant_zeros: Recorta ceros insignificantes
     human:
       decimal_units:
         format: "%n %u"
@@ -1152,57 +1159,55 @@ es:
     recurring_todos: Recursión pendiente
     remove_dependency: Remove dependency (does not delete the action)
     removed_predecessor: Removed %{successor} as dependency from %{predecessor}.
-    scheduled_overdue: Scheduled to show %{days} days ago
+    scheduled_overdue: Planificado para mostrar %{days} días anteriores
     see_all_completed: Usted puede ver todas las acciones realizadas %{link}
-    set_to_pending: "%{task} set to pending"
-    show_from: Show from
-    show_in_days: Show in %{days} days
-    show_on_date: Show on %{date}
+    set_to_pending: "%{task} fijar a pendiente"
+    show_from: Mostrar origen
+    show_in_days: Muestra en %{days} días
+    show_on_date: Mostrar en %{date}
     show_today: Show Today
-    show_tomorrow: Show Tomorrow
-    star_action: Star this action
-    star_action_with_description: star the action '%{description}'
-    tagged_page_title: TRACKS::Tagged with '%{tag_name}'
-    tagged_with: tagged with ‘%{tag_name}’
-    tags: Tags (separate with commas)
-    task_list_title: TRACKS::List tasks
+    show_tomorrow: Muestra Mañana
+    star_action: Iniciar esta acción
+    star_action_with_description: inicia la acción '%{description}'
+    tagged_page_title: TRACKS::Etiquetado con '%{tag_name}'
+    tagged_with: etiquetado con ‘%{tag_name}’
+    tags: Etiquetas (separadas por comas)
+    task_list_title: TRACKS::List etiquetadas
     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.'
+      one: Un elemento de tiquet ahora está vencido - recargue la página para verlo.
+      other: '%{count} elementos de ticket ahora están vencidos - recargue la página
+        para verlos.'
     to_tickler: al recordatorio
-    unable_to_add_dependency: Unable to add dependency
-    unresolved_dependency: The value you entered in the dependency field did not resolve
-      to an existing action. This value will not be saved with the rest of the action.
-      Continue?
-    was_due_on_date: was due on %{date}
+    unable_to_add_dependency: Es imposible añadir dependencia
+    unresolved_dependency: ''
+    was_due_on_date: venció el %{date}
   users:
-    account_signup: Account signup
-    approve_tos: I approve the Terms of Service
-    auth_change_submit: Change authentication type
-    auth_type_update_error: 'There was a problem updating your authentication type:
+    account_signup: ''
+    approve_tos: Apruebo los Términos del Servicio
+    auth_change_submit: Modifica el tipo de autenticación
+    auth_type_update_error: 'Hubo un problema actualizando su tipo de autenticación:
       %{error_messages}'
-    auth_type_updated: Authentication type updated.
-    change_auth_type_title: TRACKS::Change authentication type
-    change_authentication_type: Change authentication type
-    change_password_prompt: Enter your new password in the fields below and click
-      'Change password' to replace your current password with your new one.
-    change_password_submit: Change password
+    auth_type_updated: Tipo autenticador actualizado
+    change_auth_type_title: TRACKS::Change tipo de autenticación
+    change_authentication_type: Cambia el tipo de autenticación
+    change_password_prompt: Introduzca su contraseña nueva dentro de los campos debajo
+      y pulse «Cambiar contraseña» para sustituirla con la nueva.
+    change_password_submit: Cambiar contraseña
     change_password_title: TRACKS::Change password
-    choose_password: Choose password
-    confirm_password: Confirm password
-    desired_login: Desired login
-    destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their
-      actions, contexts, project and notes. Are you sure that you want to continue?'
-    destroy_error: There was an error deleting the user %{login}
-    destroy_successful: User %{login} was successfully destroyed
-    destroy_user: Destroy user
-    email_address: Email address
-    failed_to_delete_user: Failed to delete user %{username}
-    first_user_heading: 'Welcome to TRACKS. To get started, please create an admin
-      account:'
+    choose_password: Elija contraseña
+    confirm_password: Conformar contraseña
+    desired_login: Acceso deseado
+    destroy_confirmation: ''
+    destroy_error: Hubo un error al borrar el usuario %{login}
+    destroy_successful: El usuario %{login} fue destruido completamente
+    destroy_user: Destruir usuario
+    email_address: Dirección de correo-e
+    failed_to_delete_user: Error al borrar el usuario %{username}
+    first_user_heading: 'Bienvenido a TRACKS. Para ver como iniciar, cree una cuenta
+      de admin:'
     first_user_title: TRACKS::Sign up as the admin user
-    identity_url: Identity URL
-    label_auth_type: Authentication type
+    identity_url: Identidad URL
+    label_auth_type: Tipo de autenticación
     manage_users: Manage users
     new_password_label: New password
     new_token_generated: New token successfully generated
@@ -1237,15 +1242,15 @@ es:
       multi_page_html: Representando %{model} %{from} - %{to} de
         %{count} en el total
       single_page:
-        one: Viendo del 1 %{model}
-        other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
+        one: No %{model} encontrado
+        other: Viendo del 1 %{model}
       single_page_html:
-        one: Viendo del 1 %{model}
-        other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
+        one: No %{model} encontrado
+        other: Viendo del 1 %{model}
     page_gap: "…"
     previous_label: "« Anterior"
   rest_help:
     auth:
       title: Autenticación
+    activeresource:
+      ror_link_text: Ruby on Rails

From 86e4cdcaddefd110f0b891340fa7899ae6e606c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:16:41 +0000
Subject: [PATCH 472/767] Bump sqlite3 from 1.4.2 to 1.4.4

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.4.2 to 1.4.4.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.4.2...v1.4.4)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 003c2a05..19ac79c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,7 +123,7 @@ GEM
     htmlentities (4.3.4)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.10)
+    i18n-tasks (1.0.11)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       better_html (~> 1.0)
@@ -173,7 +173,7 @@ GEM
     mocha (1.14.0)
     mysql2 (0.5.4)
     nio4r (2.5.8)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -183,11 +183,11 @@ GEM
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails (6.0.4.7)
       actioncable (= 6.0.4.7)
       actionmailbox (= 6.0.4.7)
@@ -212,7 +212,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    rails-i18n (7.0.3)
+    rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.6)
@@ -292,7 +292,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
@@ -344,7 +344,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 5.15.1)
   htmlentities
-  i18n-tasks (~> 1.0.10)
+  i18n-tasks (~> 1.0.11)
   jquery-rails (~> 4.4)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)

From 13b8de2a9250b1ceb4048c16a297747385bc98e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:17:18 +0000
Subject: [PATCH 473/767] Bump font-awesome-sass from 5.15.1 to 6.1.2

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.15.1 to 6.1.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 842e09a1..a44ebae1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.4'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 5.15.1'
+gem 'font-awesome-sass', '~> 6.1.2'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 82cfa01f..56c3690e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,8 +114,8 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (5.15.1)
-      sassc (>= 1.11)
+    font-awesome-sass (6.1.2)
+      sassc (~> 2.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     highline (2.0.3)
@@ -342,7 +342,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner
   factory_bot_rails
-  font-awesome-sass (~> 5.15.1)
+  font-awesome-sass (~> 6.1.2)
   htmlentities
   i18n-tasks (~> 1.0.11)
   jquery-rails (~> 4.4)

From 8f3eab074400fe7da4be841ae40533528a7eab29 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 2 Aug 2022 00:28:15 +0300
Subject: [PATCH 474/767] Update icon inclusion and tests for FontAwesome 6.

---
 app/assets/stylesheets/include/icons.scss | 1 -
 test/helpers/icon_helper_test.rb          | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/include/icons.scss b/app/assets/stylesheets/include/icons.scss
index 001bc336..3141837b 100644
--- a/app/assets/stylesheets/include/icons.scss
+++ b/app/assets/stylesheets/include/icons.scss
@@ -1,2 +1 @@
-@import "font-awesome-sprockets";
 @import "font-awesome";
diff --git a/test/helpers/icon_helper_test.rb b/test/helpers/icon_helper_test.rb
index 90eaf3f4..8a40742a 100644
--- a/test/helpers/icon_helper_test.rb
+++ b/test/helpers/icon_helper_test.rb
@@ -4,10 +4,10 @@ class IconHelperTest < ActionView::TestCase
   include IconHelper
 
   test 'icon_fw generates fixed-width class' do
-    assert_equal '', icon_fw('fas', 'gear')
+    assert_equal '', icon_fw('fas', 'gear')
   end
 
   test 'icon_fw accepts an additional class' do
-    assert_equal '', icon_fw('fas', 'gear', class: 'myclass')
+    assert_equal '', icon_fw('fas', 'gear', class: 'myclass')
   end
 end

From cdb727974cf9768dcb7a910744955624f9b89b3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:59:30 +0000
Subject: [PATCH 475/767] Bump yard from 0.9.27 to 0.9.28

Bumps [yard](https://github.com/lsegal/yard) from 0.9.27 to 0.9.28.
- [Release notes](https://github.com/lsegal/yard/releases)
- [Changelog](https://github.com/lsegal/yard/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lsegal/yard/compare/v0.9.27...v0.9.28)

---
updated-dependencies:
- dependency-name: yard
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 82cfa01f..1f66d849 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,8 +114,8 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (5.15.1)
-      sassc (>= 1.11)
+    font-awesome-sass (6.1.2)
+      sassc (~> 2.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     highline (2.0.3)
@@ -292,7 +292,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
@@ -321,7 +321,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.1)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
     zeitwerk (2.6.0)
 
@@ -342,7 +342,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner
   factory_bot_rails
-  font-awesome-sass (~> 5.15.1)
+  font-awesome-sass (~> 6.1.2)
   htmlentities
   i18n-tasks (~> 1.0.11)
   jquery-rails (~> 4.4)

From cd2f9ffda3bf1aea2096ee4b41caf7ee181bb065 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:59:41 +0000
Subject: [PATCH 476/767] Bump jquery-rails from 4.4.0 to 4.5.0

Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v4.4.0...v4.5.0)

---
updated-dependencies:
- dependency-name: jquery-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  4 ++--
 Gemfile.lock | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 842e09a1..41d538d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,14 +5,14 @@ gem 'activemodel-serializers-xml', '~> 1.0.1'
 
 gem 'coffee-rails', '~> 5.0.0'
 
-gem 'jquery-rails', '~> 4.4'
+gem 'jquery-rails', '~> 4.5'
 gem 'jquery-ui-rails', '~>6.0.1'
 
 gem 'rails', '~> 6.0.4'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 5.15.1'
+gem 'font-awesome-sass', '~> 6.1.2'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 82cfa01f..0f12901d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,8 +114,8 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (5.15.1)
-      sassc (>= 1.11)
+    font-awesome-sass (6.1.2)
+      sassc (~> 2.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     highline (2.0.3)
@@ -135,7 +135,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     jaro_winkler (1.5.4)
-    jquery-rails (4.4.0)
+    jquery-rails (4.5.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -292,7 +292,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
@@ -342,10 +342,10 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner
   factory_bot_rails
-  font-awesome-sass (~> 5.15.1)
+  font-awesome-sass (~> 6.1.2)
   htmlentities
   i18n-tasks (~> 1.0.11)
-  jquery-rails (~> 4.4)
+  jquery-rails (~> 4.5)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)
   listen

From c5eb0823c439e4621241721f26d83d031f8596b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:22:18 +0000
Subject: [PATCH 477/767] Bump pg from 1.4.1 to 1.4.2

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index a44ebae1..6f56c96a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.4', group: :mysql
-gem 'pg', '~> 1.4.1', group: :postgresql
+gem 'pg', '~> 1.4.2', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index f763c079..6b59e9e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,7 +179,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.4.1)
+    pg (1.4.2)
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -321,7 +321,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.1)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
     zeitwerk (2.6.0)
 
@@ -352,7 +352,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.4)
-  pg (~> 1.4.1)
+  pg (~> 1.4.2)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 7fbcc9da12699d59c7e33d703f1f353f30b5c52a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:30:57 +0000
Subject: [PATCH 478/767] Bump solargraph from 0.44.3 to 0.45.0

Bumps [solargraph](https://github.com/castwide/solargraph) from 0.44.3 to 0.45.0.
- [Release notes](https://github.com/castwide/solargraph/releases)
- [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md)
- [Commits](https://github.com/castwide/solargraph/compare/v0.44.3...v0.45.0)

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1f66d849..fe7bbcfe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,14 +135,14 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     jaro_winkler (1.5.4)
-    jquery-rails (4.4.0)
+    jquery-rails (4.5.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.6.2)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -269,7 +269,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
     smart_properties (1.17.0)
-    solargraph (0.44.3)
+    solargraph (0.45.0)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -302,7 +302,7 @@ GEM
       ref
     thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
+    tilt (2.0.11)
     tolk (4.3.0)
       rails (>= 5.0)
       safe_yaml (>= 0.8.6)
@@ -345,7 +345,7 @@ DEPENDENCIES
   font-awesome-sass (~> 6.1.2)
   htmlentities
   i18n-tasks (~> 1.0.11)
-  jquery-rails (~> 4.4)
+  jquery-rails (~> 4.5)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)
   listen

From f77d3c7f51e79dcef3ba72a5e30799e1d6ecd1f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:42:21 +0000
Subject: [PATCH 479/767] Bump aasm from 5.2.0 to 5.3.0

Bumps [aasm](https://github.com/aasm/aasm) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/aasm/aasm/releases)
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/compare/v5.2.0...v5.3.0)

---
updated-dependencies:
- dependency-name: aasm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 4 ++--
 Gemfile.lock | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 41d538d3..502b650f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'font-awesome-sass', '~> 6.1.2'
 
 gem 'uglifier', '>=1.3.0'
 
-gem 'aasm', '~> 5.2.0'
+gem 'aasm', '~> 5.3.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.4', group: :mysql
-gem 'pg', '~> 1.4.1', group: :postgresql
+gem 'pg', '~> 1.4.2', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9336e1bc..3d442642 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    aasm (5.2.0)
+    aasm (5.3.0)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.4.7)
       actionpack (= 6.0.4.7)
@@ -179,7 +179,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.4.1)
+    pg (1.4.2)
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -330,7 +330,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  aasm (~> 5.2.0)
+  aasm (~> 5.3.0)
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
@@ -352,7 +352,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.4)
-  pg (~> 1.4.1)
+  pg (~> 1.4.2)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From 0b167bade4ec084f9b0039eade741602bba6c771 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 2 Aug 2022 10:44:43 +0300
Subject: [PATCH 480/767] Redo the locale fixes thrown out by Weblate:
 date.order should always use the English terms, fixed plurals (again) and
 added language code as root to new locales

Partially reverts #2767.
---
 config/locales/cs.yml    |   6 +-
 config/locales/es.yml    |  34 +-
 config/locales/fi.yml    |  15 +-
 config/locales/nb_NO.yml |   9 +-
 config/locales/sv.yml    |   3 +-
 config/locales/tr.yml    | 855 ++++++++++++++++++++-------------------
 6 files changed, 467 insertions(+), 455 deletions(-)

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index b7f2f665..f945c278 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -248,9 +248,9 @@ cs:
     - Listopad
     - Prosinec
     order:
-    - rok
-    - ":měsíc"
-    - den
+    - :year
+    - :month
+    - :day
   datetime:
     distance_in_words:
       about_x_hours:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 46003675..5cf075af 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -98,8 +98,9 @@ es:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tareas
-      other: tarea
+      one: tarea
+      other: tareas
+      zero: tareas
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -131,8 +132,9 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 0 notas
-      other: 1 nota
+      one: 1 nota
+      other: "%{count} notas"
+      zero: 0 notas
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -304,9 +306,9 @@ es:
     - Noviembre
     - Diciembre
     order:
-    - :año
-    - :mes
-    - :día
+    - :year
+    - :month
+    - :day
   datetime:
     distance_in_words:
       about_x_hours:
@@ -323,11 +325,13 @@ es:
         other: Casi %{count} años
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de 1 minuto
-        other: menos de un minuto
+        one: menos de un minuto
+        other: menos de %{count} minutos
+        zero: menos de 1 minuto
       less_than_x_seconds:
         one: menos de 1 segundo
-        other: menos de 1 segundo
+        other: menos de %{count} segundos
+        zero: menos de 1 segundo
       over_x_years:
         one: más de un año
         other: en %{count} años
@@ -1242,11 +1246,13 @@ es:
       multi_page_html: Representando %{model} %{from} - %{to} de
         %{count} en el total
       single_page:
-        one: No %{model} encontrado
-        other: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
+        other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
       single_page_html:
-        one: No %{model} encontrado
-        other: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
+        other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
     page_gap: "…"
     previous_label: "« Anterior"
   rest_help:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index be6931d7..3c68b79c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,8 +131,9 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: ei muistiinpanoja
-      other: 1 muistiinpano
+      one: 1 muistiinpano
+      other: "%{count} muistiinpanoa"
+      zero: ei muistiinpanoja
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1337,11 +1338,13 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
       single_page_html:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:
diff --git a/config/locales/nb_NO.yml b/config/locales/nb_NO.yml
index da706cc1..95b4343f 100644
--- a/config/locales/nb_NO.yml
+++ b/config/locales/nb_NO.yml
@@ -1,4 +1,5 @@
-activerecord:
-  attributes:
-    note:
-      created_at: Opprettet
+nb_NO:
+  activerecord:
+    attributes:
+      note:
+        created_at: Opprettet
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0967ef42..087545cf 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1 +1,2 @@
-{}
+sv:
+  {}
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index a646b311..c7e5b762 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1,428 +1,429 @@
-data:
-  import:
-    yaml_disabled: YAML yükleme kapalı
-    todos_count: İçeri aktarılacak Todos sayısı %{count}
-    projects_count: İçe aktarılacak proje sayısı %{count}
-    upload_csv: Lütfen CSV dosyanızı yükleyin
-    upload: Karşıya yükle
-    target_field: 'Şuraya içe aktar:'
-    successful: İçe aktarma başarılı.
-    map_title: Harita dosyaları içe aktarılabilir
-    header: Dosya içe aktarılıyor
-    submit: İçe aktar
-    errors:
-      invalid_destination: 'Geçersiz içe aktarma dizini: %{e}'
-      some: İçe aktarım esnasında hata meydana geldi
-      save_error: Kayıt yüklenemedi CSV (%{path_and_file}). Tracks yükleme dizinine
-        yazsın mı? %{e}
-      invalid_csv: 'Geçersiz CSV: headerler okunamadı: %{e}'
-      file_blank: Dosya boş olamaz
-    paste_field: 'İçe aktarılan YAML dosyasının içeriğini aşağıdaki metin kutucuğuna
-      yapıştır:'
-    warning: Dikkat
-    yaml_warning: '%{warning}: YAML dosyası dışa aktarılmadan önce mevcut bütün bilgileriniz
-      kaybolacak. Herhangi bir sorun yaşama ihtimalinize karşılık, eğer veri tabanına
-      şu anda erişiminiz var ise yedeklemenizi öneririz.'
-  export:
-    page_title: Tracks::Export
-    title: Dışa aktarılıyor
-    format_header: 'Aşağıdaki biçimleri seçebilirsiniz:'
-    csv_actions_description: CSV dosyası bütün eylemlerinizi, isimlendirilmiş içeriklerinizi
-      ve projelerinizi içerir
-    csv_notes_description: CSV dosyası bütün notlarınızı içerir
-    yaml_link_description: YAML dosyası bütün eylemlerinizi, içeriklerinizi, projelerinizi,
-      etiketlerinizi ve notlarınızı içerir
-    csv_notes_title: CSV dosyası (sadece notlar)
-    xml_link_title: XML dosyası (sadece eylemler)
-    yaml_description: ':{yaml}: Dışarı aktarmak için en iyisidir.'
-    download_link: İndirme bağlantısı
-    yaml_link_title: YAML dosyası
-    xml_description: '%{xml}: Veri aktarımı ve düzenleme için en iyisidir'
-    yaml_experimental: Lütfen YAML dosyalarının deneysel olarak desteklendiğini göz
-      önünde bulundurunuz. Önemli verileri yedeklerken dikkatli olunuz.
-    csv_description: '%{csv}: İş tablosuna veya veri analizi yazılımlarına aktarmak
-      için en iyisidir'
-    xml_link_description: XML dosyası bütün eylemlerinizi, içeriklerinizi, projelerinizi,
-      etiketlerinizi ve notlarınızı içerir
-    csv_actions_title: CSV dosyası (eylemler, içerikler ve projeler)
-  yaml: YAML
-  csv: CSV
-  xml: XML
-contexts:
-  visible_contexts: Görünür içerikler
-  view_link: '%{name} içeriğini görüntüle'
-  update_status_message: İçerik adı değiştirildi
-  todos_append: bu içerikte
-  status_hidden: İçerik gizli
-  status_active: İçerik etkin
-  show_form_title: Bir içerik ekle
-  show_form: Yeni bir içerik oluştur
-  save_status_message: İçerik kaydedildi
-  no_contexts_hidden: Şu anda gizli bir içerik bulunmuyor
-  no_contexts_closed: Şu anda kapalı bir içerik bulunmuyor
-  no_contexts_active: Şu anda etkin bir içerik bulunmuyor
-  no_contexts_: 'İçerik yok '
-  new_context_pre: Yeni içerik '
-  new_context_post: "' de oluşturulacaktır. Emin misiniz?"
-  letter_abbreviation: C
-  last_completed_in_context: (son%{number})
-  hide_form_title: Yeni içerik biçimini gizle
-  hide_form: Biçimi gizle
-  hidden_contexts: Gizlenmiş içerikler
-  edit_context: İçeriği düzenle
-  delete_context_title: İçeriği sil
-  delete_context_confirmation: Şu içeriği silmek istediğinize emin misiniz? %{name}'
-    İçerikteki bütün (tekrarlanan) eylemler de silinecektir!
-  delete_context: İçeriği sil
-  context_state: İçerik durumu
-  context_name: İçerik adı
-  context_hide: Font sayfasında gizle?
-  context_deleted: Silinen içerik '%{name}'
-  completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan eylemler
-  all_completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan bütün eylemler
-  add_context: İçerik ekle
-common:
-  wiki: Wiki
-  weeks: haftalar
-  week: hafta
-  website: İnternet sayfası
-  update: Güncelle
-  todo: todo
-  third: Üçüncü
-  sort:
-    sort: Sırala
-    by_task_count_title_confirm: Bu projeleri görev sayısına göre sıralamak istediğinize
-      emin misiniz? Bu işlem mevcut sıralamayı iptal edecektir.
-    by_task_count_title: Görev sayısına göre sırala
-    by_task_count: Görev sayısına göre
-    alphabetically_title: Projeleri alfabetik olarak sırala
-    alphabetically_confirm: Bu projeleri alfabetik olarak sıralamak istediğinize emin
-      misiniz? Bu işlem mevcut sıralamayı iptal edecektir.
-    alphabetically: Alfabetik sırayla
-  show_all: Hepsini göster
-  server_error: Sunucuda bir hata meydana geldi.
-  second: İkinci
-  search: Ara
-  review: Gözden geçir
-  recurring_todos: Tekrarlanan eylemler
-  projects: Projeler
-  project: Proje
-  previous: Önceki
-  optional: opsiyonel
-  ok: Tamam
-  numbered_step: Adım %{number}
-  notes: Notlar
-  not_available_abbr: n/a
-  none: Hiçbiri
-  next: Sıradaki
-  months: aylar
-  month: ay
-  mailing_list: E-posta listesi
-  logout: Çıkış
-  last: Son
-  go_back: Geri git
-  fourth: Dördüncü
-  forth: İleri
-  first: Birinci
-  errors_with_fields: 'Şu alanlarda sorunlarla karşılaşıldı:'
-  email: E-posta
-  drag_handle: SÜRÜKLE
-  description: Açıklama
-  deferred: ertelenmiş
-  create: Oluştur
-  contribute: Katkıda bulun
-  contexts: İçerikler
-  context: İçerik
-  collapse_expand: Daralt/genişlet
-  cancel: İptal
-  bugs: Hatalar
-  back: Geri
-  ajaxError: Sunucudan alınırken bir hatayla karşılaşıldı
-  add: Ekle
-  actions: Eylemler
-  action: Eylem
-  days_midsentence:
-    one: Gün
-    other: Günler
-  note:
-    one: Not yok
-    other: 1 not var
-  actions_midsentence:
-    one: Eylem
-    other: Eylemler
-activerecord:
-  errors:
-    template:
-      header:
-        one: 1 hata şunun %{model} kaydını engelledi
-        other: '%{count} hataları şunların %{model} kayıtlarını engelledi'
-      body: 'Şu alanlarda sorunlar mevcuttur:'
-    models:
-      project:
-        attributes:
-          name:
-            too_long: proje adı 256 karakterden kısa olmalıdır
-            taken: zaten mevcut
-            blank: projenin bir adı olmalıdır
-    messages:
-      wrong_length: yanlış uzunlukta (should be %{count} characters)
-      too_short: çok kısa (minimum is %{count} characters)
-      too_long: çok uzun (maximum is %{count} characters)
-      taken: zaten alınmış
-      restrict_dependent_destroy:
-        has_many: Bu kayda bağlı bir dosya bulunduğu için kayıt silinemez %{record}
-        has_one: Bu kayda bağlı farklı bir dosya bulunduğu için kayıt silinemez %{record}
-      record_invalid: 'Doğrulama başarısız: %{errors}'
-      odd: tek sayı olmalıdır
-      not_a_number: rakam değildir
-      less_than_or_equal_to: şundan az veya denk olmalıdır %{count}
-      less_than: şundan az olmalıdır %{count}
-      invalid: geçersiz
-      inclusion: listeye dahil değildir
-      greater_than_or_equal_to: şuna denk veya büyük olmalıdır %{count}
-      greater_than: şundan büyük olmalıdır %{count}
-      exclusion: alınmıştır
-      even: eşit olmalıdır
-      equal_to: şuna eşdeğer olmalıdır %{count}
-      empty: boş bırakılamaz
-      confirmation: eşleşmiyor
-      blank: boş bırakılamaz
-      accepted: Kabul edilmelidir
-    full_messages:
-      format: '%{attribute} %{message}'
-  attributes:
-    user:
-      password: Şifre
-      open_id_url: OpenID URL
-      login: Giriş
-      last_name: Soyad
-      last_login_at: Son giriş tarihi
-      first_name: İlk ad
-      email: E-posta adresi
-      display_name: Görüntüleme adı
-      created_at: Oluşturulma
-      auth_type: Auth türü
-    todo:
-      tags: Etiketler
-      show_from: Şuradan göster
-      project: Proje
-      predecessors: Değişiklik gösterir
-      notes: Notlar
-      due: Bitiş tarihi
-      description: Açıklama
-      context: içerik
-    project:
-      name: Ad
-      description: Açıklama
-      default_tags: Varsayılan etiketler
-      default_context_name: Varsayılan ortam
-    preference:
-      week_starts: Hafta başlama tarihi
-      verbose_action_descriptors: Eylem anahtar sözcüklerini (bağlam, proje) verboz
-        biçiminde göster
-      title_date_format: Başlık zaman biçimi
-      time_zone: Zaman dilimi
-      theme: Tema
-      staleness_starts: Stagnasyonu başlat
-      sms_email: E-posta'dan
-      sms_context: Varsayılan e-posta içeriği
-      show_project_on_todo_done: Yapılacaklar bitiminde proje sayfasına git
-      show_number_completed: Bitmiş eylemlerin sayısını göster
-      show_hidden_projects_in_sidebar: Gizli projeleri kenar çubuğunda göster
-      show_hidden_contexts_in_sidebar: Bitmiş içerikleri kenar çubuğunda göster
-      show_completed_projects_in_sidebar: Bitmiş projeleri kenar çubuğunda göster
-      review_period: Proje yenilenme aralığı
-      refresh: Yenilenme aralığı (dakika)
-      mobile_todos_per_page: Sayfa başı eylem sayısı (Mobil Görünüm)
-      locale: Lokal
-      email: E-posta
-      last_name: Soyad
-      first_name: İlk ad
-      due_style: Bitiş şekli
-      date_format: Tarih formatı
+tr:
+  data:
+    import:
+      yaml_disabled: YAML yükleme kapalı
+      todos_count: İçeri aktarılacak Todos sayısı %{count}
+      projects_count: İçe aktarılacak proje sayısı %{count}
+      upload_csv: Lütfen CSV dosyanızı yükleyin
+      upload: Karşıya yükle
+      target_field: 'Şuraya içe aktar:'
+      successful: İçe aktarma başarılı.
+      map_title: Harita dosyaları içe aktarılabilir
+      header: Dosya içe aktarılıyor
+      submit: İçe aktar
+      errors:
+        invalid_destination: 'Geçersiz içe aktarma dizini: %{e}'
+        some: İçe aktarım esnasında hata meydana geldi
+        save_error: Kayıt yüklenemedi CSV (%{path_and_file}). Tracks yükleme dizinine
+          yazsın mı? %{e}
+        invalid_csv: 'Geçersiz CSV: headerler okunamadı: %{e}'
+        file_blank: Dosya boş olamaz
+      paste_field: 'İçe aktarılan YAML dosyasının içeriğini aşağıdaki metin kutucuğuna
+        yapıştır:'
+      warning: Dikkat
+      yaml_warning: '%{warning}: YAML dosyası dışa aktarılmadan önce mevcut bütün bilgileriniz
+        kaybolacak. Herhangi bir sorun yaşama ihtimalinize karşılık, eğer veri tabanına
+        şu anda erişiminiz var ise yedeklemenizi öneririz.'
+    export:
+      page_title: Tracks::Export
+      title: Dışa aktarılıyor
+      format_header: 'Aşağıdaki biçimleri seçebilirsiniz:'
+      csv_actions_description: CSV dosyası bütün eylemlerinizi, isimlendirilmiş içeriklerinizi
+        ve projelerinizi içerir
+      csv_notes_description: CSV dosyası bütün notlarınızı içerir
+      yaml_link_description: YAML dosyası bütün eylemlerinizi, içeriklerinizi, projelerinizi,
+        etiketlerinizi ve notlarınızı içerir
+      csv_notes_title: CSV dosyası (sadece notlar)
+      xml_link_title: XML dosyası (sadece eylemler)
+      yaml_description: ':{yaml}: Dışarı aktarmak için en iyisidir.'
+      download_link: İndirme bağlantısı
+      yaml_link_title: YAML dosyası
+      xml_description: '%{xml}: Veri aktarımı ve düzenleme için en iyisidir'
+      yaml_experimental: Lütfen YAML dosyalarının deneysel olarak desteklendiğini göz
+        önünde bulundurunuz. Önemli verileri yedeklerken dikkatli olunuz.
+      csv_description: '%{csv}: İş tablosuna veya veri analizi yazılımlarına aktarmak
+        için en iyisidir'
+      xml_link_description: XML dosyası bütün eylemlerinizi, içeriklerinizi, projelerinizi,
+        etiketlerinizi ve notlarınızı içerir
+      csv_actions_title: CSV dosyası (eylemler, içerikler ve projeler)
+    yaml: YAML
+    csv: CSV
+    xml: XML
+  contexts:
+    visible_contexts: Görünür içerikler
+    view_link: '%{name} içeriğini görüntüle'
+    update_status_message: İçerik adı değiştirildi
+    todos_append: bu içerikte
+    status_hidden: İçerik gizli
+    status_active: İçerik etkin
+    show_form_title: Bir içerik ekle
+    show_form: Yeni bir içerik oluştur
+    save_status_message: İçerik kaydedildi
+    no_contexts_hidden: Şu anda gizli bir içerik bulunmuyor
+    no_contexts_closed: Şu anda kapalı bir içerik bulunmuyor
+    no_contexts_active: Şu anda etkin bir içerik bulunmuyor
+    no_contexts_: 'İçerik yok '
+    new_context_pre: Yeni içerik '
+    new_context_post: "' de oluşturulacaktır. Emin misiniz?"
+    letter_abbreviation: C
+    last_completed_in_context: (son%{number})
+    hide_form_title: Yeni içerik biçimini gizle
+    hide_form: Biçimi gizle
+    hidden_contexts: Gizlenmiş içerikler
+    edit_context: İçeriği düzenle
+    delete_context_title: İçeriği sil
+    delete_context_confirmation: Şu içeriği silmek istediğinize emin misiniz? %{name}'
+      İçerikteki bütün (tekrarlanan) eylemler de silinecektir!
+    delete_context: İçeriği sil
+    context_state: İçerik durumu
+    context_name: İçerik adı
+    context_hide: Font sayfasında gizle?
+    context_deleted: Silinen içerik '%{name}'
+    completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan eylemler
+    all_completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan bütün eylemler
+    add_context: İçerik ekle
+  common:
+    wiki: Wiki
+    weeks: haftalar
+    week: hafta
+    website: İnternet sayfası
+    update: Güncelle
+    todo: todo
+    third: Üçüncü
+    sort:
+      sort: Sırala
+      by_task_count_title_confirm: Bu projeleri görev sayısına göre sıralamak istediğinize
+        emin misiniz? Bu işlem mevcut sıralamayı iptal edecektir.
+      by_task_count_title: Görev sayısına göre sırala
+      by_task_count: Görev sayısına göre
+      alphabetically_title: Projeleri alfabetik olarak sırala
+      alphabetically_confirm: Bu projeleri alfabetik olarak sıralamak istediğinize emin
+        misiniz? Bu işlem mevcut sıralamayı iptal edecektir.
+      alphabetically: Alfabetik sırayla
+    show_all: Hepsini göster
+    server_error: Sunucuda bir hata meydana geldi.
+    second: İkinci
+    search: Ara
+    review: Gözden geçir
+    recurring_todos: Tekrarlanan eylemler
+    projects: Projeler
+    project: Proje
+    previous: Önceki
+    optional: opsiyonel
+    ok: Tamam
+    numbered_step: Adım %{number}
+    notes: Notlar
+    not_available_abbr: n/a
+    none: Hiçbiri
+    next: Sıradaki
+    months: aylar
+    month: ay
+    mailing_list: E-posta listesi
+    logout: Çıkış
+    last: Son
+    go_back: Geri git
+    fourth: Dördüncü
+    forth: İleri
+    first: Birinci
+    errors_with_fields: 'Şu alanlarda sorunlarla karşılaşıldı:'
+    email: E-posta
+    drag_handle: SÜRÜKLE
+    description: Açıklama
+    deferred: ertelenmiş
+    create: Oluştur
+    contribute: Katkıda bulun
+    contexts: İçerikler
+    context: İçerik
+    collapse_expand: Daralt/genişlet
+    cancel: İptal
+    bugs: Hatalar
+    back: Geri
+    ajaxError: Sunucudan alınırken bir hatayla karşılaşıldı
+    add: Ekle
+    actions: Eylemler
+    action: Eylem
+    days_midsentence:
+      one: Gün
+      other: Günler
     note:
-      updated_at: Güncellenme tarihi
-      created_at: Oluşturulma tarihi
-date:
-  abbr_day_names:
-  - Pa
-  - Pt
-  - Pe
-  - Cu
-  - Ct
-  - Cum
-  - Cmt
-  abbr_month_names:
-  - Kas
-  - Oca
-  - Şub
-  - Mar
-  - Nis
-  - May
-  - Haz
-  - Tem
-  - Ağu
-  - Eyl
-  - Eki
-  - Kas
-  - Ara
-  day_names:
-  - Pazar
-  - Pazartesi
-  - Salı
-  - Çarşamba
-  - Perşembe
-  - Cuma
-  - Cumartesi
-  formats:
-    default: '%d/%m/%Y'
-    short: '%d %b'
-    long: '%d-%m-%Y'
-    longer: '%A %d %B, %Y'
-  month_names:
-  - Ocak
-  - Şubat
-  - Eylül
-  - Mart
-  - Nisan
-  - Mayıs
-  - Haziran
-  - Temmuz
-  - Ağustos
-  - Ekim
-  - Kasım
-  - Aralık
-  - Aralık
-  order:
-  - :yıl
-  - :gün
-  - :day
-datetime:
-  prompts:
-    day: Gün
-    hour: Saat
-    minute: Dakika
-    month: Ay
-    year: Yıl
-    second: Saniye
-  distance_in_words:
-    almost_x_years:
-      one: neredeyse 1 yıl
-      other: neredeyse %{count} yıl
-    half_a_minute: yarım dakika
-    x_seconds:
-      one: 1 saniye
-      other: '%{count} saniye'
-    x_days:
-      one: 1 gün
-      other: '%{count} gün'
-    x_months:
-      one: 1 ay
-      other: '%{count} ay'
-    about_x_months:
-      one: yaklaşık 1 ay
-      other: yaklaşık %{count} ay
-    about_x_hours:
-      one: yaklaşık 1 saat
-      other: yaklaşık %{count} saat
-    about_x_years:
-      one: yaklaşık 1 yıl
-      other: yaklaşık %{count} yıl
-    x_minutes:
-      one: 1 dakika
-      other: '%{count} dakika'
-    over_x_years:
-      one: 1 yıldan fazla
-      other: '%{count} yıldan fazla'
-errors:
-  messages:
-    blank: boş bırakılamaz
-    less_than: "%{count}'dan az olmalıdır"
-    not_a_number: bir sayı değildir
-    other_than: "%{count}'dan farklı olmalıdır"
-    present: boş olmalıdır
-    taken: daha önceden alınmış
-    not_an_integer: integer olmalıdır
-    odd: tek sayı olmalıdır
-    too_long: çok uzun (en fazla %{count} karakter olabilir)
-    too_short: çok kısa ( en az %{count} karakter olabilir)
-    accepted: kabul edilmelidir
-    confirmation: '%{attribute} ile eşleşmemektedir'
-    empty: boş bırakılamaz
-    equal_to: '%{count} ile eşit olmalıdır'
-    inclusion: listeye dahil değildir
-    invalid: geçersiz
-    less_than_or_equal_to: "%{count}'dan az veya eşit olmalıdır"
-    wrong_length: yanlış uzunluk (karakter sayısı %{count} kadar olmalıdır)
-    even: eşit olmalıdır
-    greater_than_or_equal_to: "%{count}'dan büyük veya eşit olmalıdır"
-    exclusion: daha önceden alınmış
-    greater_than: "%{count}'dan büyük olmalıdır"
-  format: '%{attribute} %{message}'
-  user_unauthorized: '401 Yetkisiz: sadece yetkili kullanıcılar bu özelliğe erişime
-    sahiptir.'
-feedlist:
-  actions_completed_last_week: Son 7 günde tamamlanan eylemler
-  actions_due_next_week: 7 gün veya daha önce bitecek eylemler
-  actions_due_today: Bugün veya daha erken bitecek olan eylemler
-  active_projects_wo_next: Eylemi bulunmayan aktif projeler
-  all_projects: Bütün Projeler
-  choose_context: Almak istediğiniz içeriği seçin
-  projects_and_actions: Aktif projeler ve eylemleri
-  rss_feed: RSS Akışı
-  active_starred_actions: Yıldızlı, etkin eylemler
-  all_actions: Tüm eylemler
-  all_contexts: Bütün İçerikler
-  choose_project: Almak istediğiniz projeyi seçin
-  context_centric_actions: Belirli bir içerikteki tamamlanmamış eylemler için akış
-  context_needed: Akış talep etmeden önce en az bir içerik olmalı
-  ical_feed: iCal akış
-  last_fixed_number: Son %{number} eylem/ler
-  legend: 'Semboller:'
-  notice_incomplete_only: "Not: Akış, aksi işaretlenmedikçe sadece tamamlanmamış eylemleri\
-    \ gösterir. Bu iCal akışları todo listesine eklenebilir. Eğer bitimi yaklaşan\
-    \ todo'ları takvimde görüntülemek istiyorsanız, takvim sayfasından iCal akışını\
-    \ kullanın"
-  plain_text_feed: Düz Yazı Akışı
-  project_centric: Belirli bir projedeki tamamlanmamış eylemler akışı
-  project_needed: Akış talep etmeden önce en az bir proje olmalı
-  select_feed_for_context: Bu içerik için akış seçin
-  select_feed_for_project: Bu proje için akış seçin
-integrations:
-  sections:
-    email_rich: Zengin Todo Mesaj e-posta formatı
-    message_gateway: Tracks aracılığıyla e-posta gönderebilmek için Tracks'ı e-posta
-      serverine bağlayın
-    automatic_email: Yaklaşan eylemler için kendinize otomatik e-posta gönderin
-    mailgun: Mailgun aracılığıyla Tracks'a e-posta gönder
-  opensearch_description: Tracks'ta ara
-  title: Entegrasyonlar
-  add_your_own: Eklemek istediğiniz araç mı var? Tracks'ın gelecek sürümlerine ekleyebilmemiz
-    için bize gönderin %{tell_us_link}.
-  intro: 'Tracks işinize yarayabilecek diğer araçlarla entegre edilebilir! Bu sayfa
-    bazılarını entegre etmeye yönelik bilgi içerir. Her platforma uygulanabilir olmayabilirler
-    ve bazıları diğerlerine kıyasla daha fazla teknik bilgi gerektirebilir. Ek bilgi
-    için: %{documentation_link}'
-  developer_documentation_link: Tracks için geliştirici dokümantasyonu
-  contents_header: 'İçerikler:'
-  tell_us_link_text: Bunun hakkında bize görüş bildirin
-  cron_2: Başka bir metin kullanabilirsiniz %{feeds_link} Projede birlikte çalıştığınız
-    meslektaşlarınıza neden listeyi e-posta gönderemeyesiniz ki?
-  cron_email_subject: Bitimi 7 gün içerisinde olan Tracks eylemleri
-  feeds_link_text: akış Tracks tarafından sağlanmıştır
-  cron_1: Bu girdiyi crontab üzerinden girerseniz, her gün ÖÖ 5'te 7 gün içerisinde
-    bitimi yaklaşan eylemlerle ilgili bir e-posta alacaksınız.
-  message_gateway:
-    rich_api_tip: Mesaj içeriği tanım, içerik ve proje kısmına, not ise gövde metnine
-      yazarak "çamaşırları yıka @ Ev" veya "Mehmet'i Ara > x projesi" ve benzeri türden
-      görevler oluşturmak için Rich Todo API kullanabilirsiniz.
-footer:
-  send_feedback: Geri bildirim
-  version: 'Tracks %{version} (%{revision_with_date})'
-helpers:
-  select:
-    prompt: Seçiniz
-  submit:
-    create: Oluştur %{model}
-    submit: Kaydet %{model}
-    update: Güncelle %{model}
+      one: Not yok
+      other: 1 not var
+    actions_midsentence:
+      one: Eylem
+      other: Eylemler
+  activerecord:
+    errors:
+      template:
+        header:
+          one: 1 hata şunun %{model} kaydını engelledi
+          other: '%{count} hataları şunların %{model} kayıtlarını engelledi'
+        body: 'Şu alanlarda sorunlar mevcuttur:'
+      models:
+        project:
+          attributes:
+            name:
+              too_long: proje adı 256 karakterden kısa olmalıdır
+              taken: zaten mevcut
+              blank: projenin bir adı olmalıdır
+      messages:
+        wrong_length: yanlış uzunlukta (should be %{count} characters)
+        too_short: çok kısa (minimum is %{count} characters)
+        too_long: çok uzun (maximum is %{count} characters)
+        taken: zaten alınmış
+        restrict_dependent_destroy:
+          has_many: Bu kayda bağlı bir dosya bulunduğu için kayıt silinemez %{record}
+          has_one: Bu kayda bağlı farklı bir dosya bulunduğu için kayıt silinemez %{record}
+        record_invalid: 'Doğrulama başarısız: %{errors}'
+        odd: tek sayı olmalıdır
+        not_a_number: rakam değildir
+        less_than_or_equal_to: şundan az veya denk olmalıdır %{count}
+        less_than: şundan az olmalıdır %{count}
+        invalid: geçersiz
+        inclusion: listeye dahil değildir
+        greater_than_or_equal_to: şuna denk veya büyük olmalıdır %{count}
+        greater_than: şundan büyük olmalıdır %{count}
+        exclusion: alınmıştır
+        even: eşit olmalıdır
+        equal_to: şuna eşdeğer olmalıdır %{count}
+        empty: boş bırakılamaz
+        confirmation: eşleşmiyor
+        blank: boş bırakılamaz
+        accepted: Kabul edilmelidir
+      full_messages:
+        format: '%{attribute} %{message}'
+    attributes:
+      user:
+        password: Şifre
+        open_id_url: OpenID URL
+        login: Giriş
+        last_name: Soyad
+        last_login_at: Son giriş tarihi
+        first_name: İlk ad
+        email: E-posta adresi
+        display_name: Görüntüleme adı
+        created_at: Oluşturulma
+        auth_type: Auth türü
+      todo:
+        tags: Etiketler
+        show_from: Şuradan göster
+        project: Proje
+        predecessors: Değişiklik gösterir
+        notes: Notlar
+        due: Bitiş tarihi
+        description: Açıklama
+        context: içerik
+      project:
+        name: Ad
+        description: Açıklama
+        default_tags: Varsayılan etiketler
+        default_context_name: Varsayılan ortam
+      preference:
+        week_starts: Hafta başlama tarihi
+        verbose_action_descriptors: Eylem anahtar sözcüklerini (bağlam, proje) verboz
+          biçiminde göster
+        title_date_format: Başlık zaman biçimi
+        time_zone: Zaman dilimi
+        theme: Tema
+        staleness_starts: Stagnasyonu başlat
+        sms_email: E-posta'dan
+        sms_context: Varsayılan e-posta içeriği
+        show_project_on_todo_done: Yapılacaklar bitiminde proje sayfasına git
+        show_number_completed: Bitmiş eylemlerin sayısını göster
+        show_hidden_projects_in_sidebar: Gizli projeleri kenar çubuğunda göster
+        show_hidden_contexts_in_sidebar: Bitmiş içerikleri kenar çubuğunda göster
+        show_completed_projects_in_sidebar: Bitmiş projeleri kenar çubuğunda göster
+        review_period: Proje yenilenme aralığı
+        refresh: Yenilenme aralığı (dakika)
+        mobile_todos_per_page: Sayfa başı eylem sayısı (Mobil Görünüm)
+        locale: Lokal
+        email: E-posta
+        last_name: Soyad
+        first_name: İlk ad
+        due_style: Bitiş şekli
+        date_format: Tarih formatı
+      note:
+        updated_at: Güncellenme tarihi
+        created_at: Oluşturulma tarihi
+  date:
+    abbr_day_names:
+    - Pa
+    - Pt
+    - Pe
+    - Cu
+    - Ct
+    - Cum
+    - Cmt
+    abbr_month_names:
+    - Kas
+    - Oca
+    - Şub
+    - Mar
+    - Nis
+    - May
+    - Haz
+    - Tem
+    - Ağu
+    - Eyl
+    - Eki
+    - Kas
+    - Ara
+    day_names:
+    - Pazar
+    - Pazartesi
+    - Salı
+    - Çarşamba
+    - Perşembe
+    - Cuma
+    - Cumartesi
+    formats:
+      default: '%d/%m/%Y'
+      short: '%d %b'
+      long: '%d-%m-%Y'
+      longer: '%A %d %B, %Y'
+    month_names:
+    - Ocak
+    - Şubat
+    - Eylül
+    - Mart
+    - Nisan
+    - Mayıs
+    - Haziran
+    - Temmuz
+    - Ağustos
+    - Ekim
+    - Kasım
+    - Aralık
+    - Aralık
+    order:
+    - :year
+    - :month
+    - :day
+  datetime:
+    prompts:
+      day: Gün
+      hour: Saat
+      minute: Dakika
+      month: Ay
+      year: Yıl
+      second: Saniye
+    distance_in_words:
+      almost_x_years:
+        one: neredeyse 1 yıl
+        other: neredeyse %{count} yıl
+      half_a_minute: yarım dakika
+      x_seconds:
+        one: 1 saniye
+        other: '%{count} saniye'
+      x_days:
+        one: 1 gün
+        other: '%{count} gün'
+      x_months:
+        one: 1 ay
+        other: '%{count} ay'
+      about_x_months:
+        one: yaklaşık 1 ay
+        other: yaklaşık %{count} ay
+      about_x_hours:
+        one: yaklaşık 1 saat
+        other: yaklaşık %{count} saat
+      about_x_years:
+        one: yaklaşık 1 yıl
+        other: yaklaşık %{count} yıl
+      x_minutes:
+        one: 1 dakika
+        other: '%{count} dakika'
+      over_x_years:
+        one: 1 yıldan fazla
+        other: '%{count} yıldan fazla'
+  errors:
+    messages:
+      blank: boş bırakılamaz
+      less_than: "%{count}'dan az olmalıdır"
+      not_a_number: bir sayı değildir
+      other_than: "%{count}'dan farklı olmalıdır"
+      present: boş olmalıdır
+      taken: daha önceden alınmış
+      not_an_integer: integer olmalıdır
+      odd: tek sayı olmalıdır
+      too_long: çok uzun (en fazla %{count} karakter olabilir)
+      too_short: çok kısa ( en az %{count} karakter olabilir)
+      accepted: kabul edilmelidir
+      confirmation: '%{attribute} ile eşleşmemektedir'
+      empty: boş bırakılamaz
+      equal_to: '%{count} ile eşit olmalıdır'
+      inclusion: listeye dahil değildir
+      invalid: geçersiz
+      less_than_or_equal_to: "%{count}'dan az veya eşit olmalıdır"
+      wrong_length: yanlış uzunluk (karakter sayısı %{count} kadar olmalıdır)
+      even: eşit olmalıdır
+      greater_than_or_equal_to: "%{count}'dan büyük veya eşit olmalıdır"
+      exclusion: daha önceden alınmış
+      greater_than: "%{count}'dan büyük olmalıdır"
+    format: '%{attribute} %{message}'
+    user_unauthorized: '401 Yetkisiz: sadece yetkili kullanıcılar bu özelliğe erişime
+      sahiptir.'
+  feedlist:
+    actions_completed_last_week: Son 7 günde tamamlanan eylemler
+    actions_due_next_week: 7 gün veya daha önce bitecek eylemler
+    actions_due_today: Bugün veya daha erken bitecek olan eylemler
+    active_projects_wo_next: Eylemi bulunmayan aktif projeler
+    all_projects: Bütün Projeler
+    choose_context: Almak istediğiniz içeriği seçin
+    projects_and_actions: Aktif projeler ve eylemleri
+    rss_feed: RSS Akışı
+    active_starred_actions: Yıldızlı, etkin eylemler
+    all_actions: Tüm eylemler
+    all_contexts: Bütün İçerikler
+    choose_project: Almak istediğiniz projeyi seçin
+    context_centric_actions: Belirli bir içerikteki tamamlanmamış eylemler için akış
+    context_needed: Akış talep etmeden önce en az bir içerik olmalı
+    ical_feed: iCal akış
+    last_fixed_number: Son %{number} eylem/ler
+    legend: 'Semboller:'
+    notice_incomplete_only: "Not: Akış, aksi işaretlenmedikçe sadece tamamlanmamış eylemleri\
+      \ gösterir. Bu iCal akışları todo listesine eklenebilir. Eğer bitimi yaklaşan\
+      \ todo'ları takvimde görüntülemek istiyorsanız, takvim sayfasından iCal akışını\
+      \ kullanın"
+    plain_text_feed: Düz Yazı Akışı
+    project_centric: Belirli bir projedeki tamamlanmamış eylemler akışı
+    project_needed: Akış talep etmeden önce en az bir proje olmalı
+    select_feed_for_context: Bu içerik için akış seçin
+    select_feed_for_project: Bu proje için akış seçin
+  integrations:
+    sections:
+      email_rich: Zengin Todo Mesaj e-posta formatı
+      message_gateway: Tracks aracılığıyla e-posta gönderebilmek için Tracks'ı e-posta
+        serverine bağlayın
+      automatic_email: Yaklaşan eylemler için kendinize otomatik e-posta gönderin
+      mailgun: Mailgun aracılığıyla Tracks'a e-posta gönder
+    opensearch_description: Tracks'ta ara
+    title: Entegrasyonlar
+    add_your_own: Eklemek istediğiniz araç mı var? Tracks'ın gelecek sürümlerine ekleyebilmemiz
+      için bize gönderin %{tell_us_link}.
+    intro: 'Tracks işinize yarayabilecek diğer araçlarla entegre edilebilir! Bu sayfa
+      bazılarını entegre etmeye yönelik bilgi içerir. Her platforma uygulanabilir olmayabilirler
+      ve bazıları diğerlerine kıyasla daha fazla teknik bilgi gerektirebilir. Ek bilgi
+      için: %{documentation_link}'
+    developer_documentation_link: Tracks için geliştirici dokümantasyonu
+    contents_header: 'İçerikler:'
+    tell_us_link_text: Bunun hakkında bize görüş bildirin
+    cron_2: Başka bir metin kullanabilirsiniz %{feeds_link} Projede birlikte çalıştığınız
+      meslektaşlarınıza neden listeyi e-posta gönderemeyesiniz ki?
+    cron_email_subject: Bitimi 7 gün içerisinde olan Tracks eylemleri
+    feeds_link_text: akış Tracks tarafından sağlanmıştır
+    cron_1: Bu girdiyi crontab üzerinden girerseniz, her gün ÖÖ 5'te 7 gün içerisinde
+      bitimi yaklaşan eylemlerle ilgili bir e-posta alacaksınız.
+    message_gateway:
+      rich_api_tip: Mesaj içeriği tanım, içerik ve proje kısmına, not ise gövde metnine
+        yazarak "çamaşırları yıka @ Ev" veya "Mehmet'i Ara > x projesi" ve benzeri türden
+        görevler oluşturmak için Rich Todo API kullanabilirsiniz.
+  footer:
+    send_feedback: Geri bildirim
+    version: 'Tracks %{version} (%{revision_with_date})'
+  helpers:
+    select:
+      prompt: Seçiniz
+    submit:
+      create: Oluştur %{model}
+      submit: Kaydet %{model}
+      update: Güncelle %{model}

From 4fef516bc142c5f6790e3bd6329eb10077a6eb47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Aug 2022 00:02:35 +0000
Subject: [PATCH 481/767] Bump rubocop from 1.32.0 to 1.33.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.32.0 to 1.33.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.32.0...v1.33.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 502b650f..0e4aed52 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.32', require: false
+  gem 'rubocop', '~> 1.33', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 4da21d95..4900fe82 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,7 +237,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.32.0)
+    rubocop (1.33.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -360,7 +360,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.32)
+  rubocop (~> 1.33)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 819dbb4a1e3893a8e139677e5baa68c93cb8fc70 Mon Sep 17 00:00:00 2001
From: "Sean M. Pappalardo" 
Date: Sun, 7 Aug 2022 16:15:08 -0700
Subject: [PATCH 482/767] Update installation.md for PostgreSQL

Update installation.md with PostgreSQL adapter info for the database.yml file
---
 doc/installation.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index f3a0036b..7bb7375b 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -168,10 +168,13 @@ Tracks is built upon a number of Ruby libraries (known as ‘gems’). The Bundl
 ## Configure variables
 
 1. In the `config` folder, copy the files `database.yml.tmpl` and `site.yml.tmpl` to `database.yml` and `site.yml`, respectively.
-2. Open the file `config/database.yml` and edit the `production:` section with the details of your database. If you are using MySQL the `adapter:` line should read `adapter: mysql2`, `host: localhost` (in the majority of cases), and your username and password should match those you assigned when you created the database. If you are using SQLite3, you should have only two lines under the production section: `adapter: sqlite3` and `database: db/tracks.db`.
-3. Open the file `config/site.yml`, and read through the settings to make sure that they suit your setup. In most cases, all you need to change are the `secret_token`, the administrator email address (`admin_email`), and the time zone setting. For the time zone setting you can use the command `bundle exec rake time:zones:local` to see all available timezones on your machine
-4. If you are using Windows, you may need to check the ‘shebang’ lines (`#!/usr/bin/env ruby`) of the `/public/dispatch.*` files and all the files in the `/script` directory. They are set to `#!/usr/bin/env ruby` by default. This should work for all Unix based setups (Linux or Mac OS X), but Windows users will probably have to change it to something like `#c:/ruby/bin/ruby` to point to the Ruby binary on your system.
-5. If you intend to use Tracks behind a web server or reverse proxy with https enabled, ensure to set `force_ssl` option to `true`.
+2. Open the file `config/database.yml` and edit the `production:` section with the details of your database.
+   * If you are using MySQL the `adapter:` line should read `adapter: mysql2`, `host: localhost` (in the majority of cases), and your username and password should match those you assigned when you created the database. 
+   * If you are using PostgreSQL, set the line to `adapter: postgresql` and adjust host, username and password as appropriate.
+   * If you are using SQLite3, you should have only two lines under the production section: `adapter: sqlite3` and `database: db/tracks.db`.
+5. Open the file `config/site.yml`, and read through the settings to make sure that they suit your setup. In most cases, all you need to change are the `secret_token`, the administrator email address (`admin_email`), and the time zone setting. For the time zone setting you can use the command `bundle exec rake time:zones:local` to see all available timezones on your machine
+6. If you are using Windows, you may need to check the ‘shebang’ lines (`#!/usr/bin/env ruby`) of the `/public/dispatch.*` files and all the files in the `/script` directory. They are set to `#!/usr/bin/env ruby` by default. This should work for all Unix based setups (Linux or Mac OS X), but Windows users will probably have to change it to something like `#c:/ruby/bin/ruby` to point to the Ruby binary on your system.
+7. If you intend to use Tracks behind a web server or reverse proxy with https enabled, ensure to set `force_ssl` option to `true`.
 
 ### Populate your database with the Tracks schema
 

From 1e76f598b8c685c434659affd33a726016db20f4 Mon Sep 17 00:00:00 2001
From: "Sean M. Pappalardo" 
Date: Sun, 7 Aug 2022 16:18:36 -0700
Subject: [PATCH 483/767] Update database.yml.tmpl with PGSQL hint

---
 config/database.yml.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/database.yml.tmpl b/config/database.yml.tmpl
index 56233f39..b681edf2 100644
--- a/config/database.yml.tmpl
+++ b/config/database.yml.tmpl
@@ -9,6 +9,7 @@ development:
   password:
 
 production:
+  # Set this to 'postgresql' if using PostgreSQL.
   adapter: mysql2
   database: tracks
   # set this if you are storing utf8 in your mysql database to handle strings

From cbf01662083e2bd83df29ad4dba4b06040006a0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 00:01:50 +0000
Subject: [PATCH 484/767] Bump rubocop from 1.33.0 to 1.34.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.33.0 to 1.34.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.33.0...v1.34.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e4aed52..d322356e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.33', require: false
+  gem 'rubocop', '~> 1.34', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 4900fe82..0ec05448 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,7 +177,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pg (1.4.2)
     puma (5.6.4)
@@ -237,17 +237,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.33.0)
+    rubocop (1.34.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.19.1, < 2.0)
+      rubocop-ast (>= 1.20.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
@@ -360,7 +360,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.33)
+  rubocop (~> 1.34)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 6db8474c496b21e21316226c7daa1a7012cc9c46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 00:02:01 +0000
Subject: [PATCH 485/767] Bump pg from 1.4.2 to 1.4.3

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.2...v1.4.3)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e4aed52..54fd298a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.4', group: :mysql
-gem 'pg', '~> 1.4.2', group: :postgresql
+gem 'pg', '~> 1.4.3', group: :postgresql
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4900fe82..cbd1ff78 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,7 +179,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.4.2)
+    pg (1.4.3)
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -352,7 +352,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.4)
-  pg (~> 1.4.2)
+  pg (~> 1.4.3)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.4)

From e669a18733095f75f2950afe35a80983873e647d Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 11 Aug 2022 22:53:59 +0300
Subject: [PATCH 486/767] Test the index page with all locales to make sure
 missing frontend locale files aren't fatal

---
 test/integration/locale_test.rb          | 22 ++++++++++++++++++++++
 test/integration/recurring_todos_test.rb | 11 -----------
 test/test_helper.rb                      | 11 +++++++++++
 3 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 test/integration/locale_test.rb

diff --git a/test/integration/locale_test.rb b/test/integration/locale_test.rb
new file mode 100644
index 00000000..084f88fd
--- /dev/null
+++ b/test/integration/locale_test.rb
@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class LocaleTest < ActionDispatch::IntegrationTest
+
+  fixtures :users
+
+  def test_locale_index
+    logs_in_as(users(:other_user_email), 'open')
+    @user = User.find(@request.session['user_id'])
+    locales = I18n.available_locales.map {|l| l.to_s}
+    locales.each do |locale|
+      # Set the locale
+      @user.preference.locale = locale
+      @user.preference.save!
+      logs_in_as(users(:other_user_email), 'open')
+      get '/'
+      assert_response :success
+      assert_template "todos/index"
+    end
+  end
+
+end
diff --git a/test/integration/recurring_todos_test.rb b/test/integration/recurring_todos_test.rb
index 1f461e51..c12738b8 100644
--- a/test/integration/recurring_todos_test.rb
+++ b/test/integration/recurring_todos_test.rb
@@ -2,17 +2,6 @@ require 'test_helper'
 
 class RecurringTodosTest < ActionDispatch::IntegrationTest
 
-  def logs_in_as(user,plain_pass)
-    @user = user
-    post "/login", params: { :user_login => @user.login,
-      :user_password => plain_pass,
-      :user_noexpiry => 'n' }
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "todos/index"
-  end
-
   def test_deleting_recurring_todo_clears_reference_from_related_todos
     logs_in_as(users(:admin_user), 'abracadabra')
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 70c26275..391c5cc7 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -109,6 +109,17 @@ end
 
 class ActionDispatch::IntegrationTest
 
+  def logs_in_as(user, plain_pass)
+    @user = user
+    post "/login", params: { :user_login => @user.login,
+      :user_password => plain_pass,
+      :user_noexpiry => 'n' }
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "todos/index"
+  end
+
   def authenticated_post_xml(url, username, password, parameters, headers = {})
     post url, params: parameters, headers:
         { 'HTTP_AUTHORIZATION' => "Basic " + Base64.encode64("#{username}:#{password}"),

From 21373cea4318822c33b36e044c98c04333d9121e Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 2 Aug 2022 11:35:30 +0300
Subject: [PATCH 487/767] Update Datepicker localisations and add missing ones.
 The nb_NO is just a renamed nb. The files are straight from upstream at
 https://github.com/jquery/jquery-ui/tree/main/ui/i18n

---
 .codeclimate.yml                              |  4 +-
 app/assets/config/manifest.js                 |  3 ++
 .../javascripts-jquery-ui/datepicker-cs.js    | 21 ++++----
 .../javascripts-jquery-ui/datepicker-de.js    | 25 +++++----
 .../javascripts-jquery-ui/datepicker-es.js    | 25 +++++----
 .../javascripts-jquery-ui/datepicker-fi.js    | 25 +++++----
 .../javascripts-jquery-ui/datepicker-fr.js    |  9 ++--
 .../javascripts-jquery-ui/datepicker-he.js    | 25 +++++----
 .../javascripts-jquery-ui/datepicker-nb_NO.js | 52 +++++++++++++++++++
 .../javascripts-jquery-ui/datepicker-nl.js    | 11 ++--
 .../javascripts-jquery-ui/datepicker-ru.js    | 25 +++++----
 .../javascripts-jquery-ui/datepicker-sv.js    | 40 ++++++++++++++
 .../javascripts-jquery-ui/datepicker-tr.js    | 40 ++++++++++++++
 13 files changed, 233 insertions(+), 72 deletions(-)
 create mode 100644 app/assets/javascripts-jquery-ui/datepicker-nb_NO.js
 create mode 100644 app/assets/javascripts-jquery-ui/datepicker-sv.js
 create mode 100644 app/assets/javascripts-jquery-ui/datepicker-tr.js

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 9bdd8e92..916b43f3 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -12,7 +12,7 @@ checks:
   method-lines:
     config:
       threshold: 100
-engines:
+plugins:
   brakeman:
     enabled: true
   fixme:
@@ -30,3 +30,5 @@ engines:
         enabled: false
       Rubocop/Style/HashSyntax:
         enabled: false
+#exclude_patterns:
+#- app/assets/javascripts-jquery-ui
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index cbc0e71e..b5527f37 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -7,5 +7,8 @@
 //= link datepicker-fi.js
 //= link datepicker-fr.js
 //= link datepicker-he.js
+//= link datepicker-nb_NO.js
 //= link datepicker-nl.js
 //= link datepicker-ru.js
+//= link datepicker-sv.js
+//= link datepicker-tr.js
diff --git a/app/assets/javascripts-jquery-ui/datepicker-cs.js b/app/assets/javascripts-jquery-ui/datepicker-cs.js
index c2f79cf9..6e5552c6 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-cs.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-cs.js
@@ -1,6 +1,8 @@
 /* Czech initialisation for the jQuery UI date picker plugin. */
 /* Written by Tomas Muller (tomas@tomas-muller.net). */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -10,20 +12,21 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.cs = {
 	closeText: "Zavřít",
-	prevText: "<Dříve",
-	nextText: "Později>",
+	prevText: "Dříve",
+	nextText: "Později",
 	currentText: "Nyní",
-	monthNames: [ "leden","únor","březen","duben","květen","červen",
-	"červenec","srpen","září","říjen","listopad","prosinec" ],
-	monthNamesShort: [ "led","úno","bře","dub","kvě","čer",
-	"čvc","srp","zář","říj","lis","pro" ],
+	monthNames: [ "leden", "únor", "březen", "duben", "květen", "červen",
+	"červenec", "srpen", "září", "říjen", "listopad", "prosinec" ],
+	monthNamesShort: [ "led", "úno", "bře", "dub", "kvě", "čer",
+	"čvc", "srp", "zář", "říj", "lis", "pro" ],
 	dayNames: [ "neděle", "pondělí", "úterý", "středa", "čtvrtek", "pátek", "sobota" ],
 	dayNamesShort: [ "ne", "po", "út", "st", "čt", "pá", "so" ],
-	dayNamesMin: [ "ne","po","út","st","čt","pá","so" ],
+	dayNamesMin: [ "ne", "po", "út", "st", "čt", "pá", "so" ],
 	weekHeader: "Týd",
 	dateFormat: "dd.mm.yy",
 	firstDay: 1,
@@ -34,4 +37,4 @@ datepicker.setDefaults( datepicker.regional.cs );
 
 return datepicker.regional.cs;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-de.js b/app/assets/javascripts-jquery-ui/datepicker-de.js
index a6779084..8a08ebf3 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-de.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-de.js
@@ -1,6 +1,8 @@
 /* German initialisation for the jQuery UI date picker plugin. */
 /* Written by Milian Wolff (mail@milianw.de). */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -10,20 +12,21 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.de = {
 	closeText: "Schließen",
-	prevText: "<Zurück",
-	nextText: "Vor>",
+	prevText: "Zurück",
+	nextText: "Vor",
 	currentText: "Heute",
-	monthNames: [ "Januar","Februar","März","April","Mai","Juni",
-	"Juli","August","September","Oktober","November","Dezember" ],
-	monthNamesShort: [ "Jan","Feb","Mär","Apr","Mai","Jun",
-	"Jul","Aug","Sep","Okt","Nov","Dez" ],
-	dayNames: [ "Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag" ],
-	dayNamesShort: [ "So","Mo","Di","Mi","Do","Fr","Sa" ],
-	dayNamesMin: [ "So","Mo","Di","Mi","Do","Fr","Sa" ],
+	monthNames: [ "Januar", "Februar", "März", "April", "Mai", "Juni",
+	"Juli", "August", "September", "Oktober", "November", "Dezember" ],
+	monthNamesShort: [ "Jan", "Feb", "Mär", "Apr", "Mai", "Jun",
+	"Jul", "Aug", "Sep", "Okt", "Nov", "Dez" ],
+	dayNames: [ "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag" ],
+	dayNamesShort: [ "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa" ],
+	dayNamesMin: [ "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa" ],
 	weekHeader: "KW",
 	dateFormat: "dd.mm.yy",
 	firstDay: 1,
@@ -34,4 +37,4 @@ datepicker.setDefaults( datepicker.regional.de );
 
 return datepicker.regional.de;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-es.js b/app/assets/javascripts-jquery-ui/datepicker-es.js
index ea7116e0..dbb1f0aa 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-es.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-es.js
@@ -1,6 +1,8 @@
 /* Inicialización en español para la extensión 'UI date picker' para jQuery. */
 /* Traducido por Vester (xvester@gmail.com). */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -10,20 +12,21 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.es = {
 	closeText: "Cerrar",
-	prevText: "<Ant",
-	nextText: "Sig>",
+	prevText: "Ant",
+	nextText: "Sig",
 	currentText: "Hoy",
-	monthNames: [ "enero","febrero","marzo","abril","mayo","junio",
-	"julio","agosto","septiembre","octubre","noviembre","diciembre" ],
-	monthNamesShort: [ "ene","feb","mar","abr","may","jun",
-	"jul","ago","sep","oct","nov","dic" ],
-	dayNames: [ "domingo","lunes","martes","miércoles","jueves","viernes","sábado" ],
-	dayNamesShort: [ "dom","lun","mar","mié","jue","vie","sáb" ],
-	dayNamesMin: [ "D","L","M","X","J","V","S" ],
+	monthNames: [ "enero", "febrero", "marzo", "abril", "mayo", "junio",
+	"julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre" ],
+	monthNamesShort: [ "ene", "feb", "mar", "abr", "may", "jun",
+	"jul", "ago", "sep", "oct", "nov", "dic" ],
+	dayNames: [ "domingo", "lunes", "martes", "miércoles", "jueves", "viernes", "sábado" ],
+	dayNamesShort: [ "dom", "lun", "mar", "mié", "jue", "vie", "sáb" ],
+	dayNamesMin: [ "D", "L", "M", "X", "J", "V", "S" ],
 	weekHeader: "Sm",
 	dateFormat: "dd/mm/yy",
 	firstDay: 1,
@@ -34,4 +37,4 @@ datepicker.setDefaults( datepicker.regional.es );
 
 return datepicker.regional.es;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-fi.js b/app/assets/javascripts-jquery-ui/datepicker-fi.js
index a8386ff6..d355e9eb 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-fi.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-fi.js
@@ -1,6 +1,8 @@
 /* Finnish initialisation for the jQuery UI date picker plugin. */
 /* Written by Harri Kilpiö (harrikilpio@gmail.com). */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -10,20 +12,21 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.fi = {
 	closeText: "Sulje",
-	prevText: "«Edellinen",
-	nextText: "Seuraava»",
+	prevText: "Edellinen",
+	nextText: "Seuraava",
 	currentText: "Tänään",
-	monthNames: [ "Tammikuu","Helmikuu","Maaliskuu","Huhtikuu","Toukokuu","Kesäkuu",
-	"Heinäkuu","Elokuu","Syyskuu","Lokakuu","Marraskuu","Joulukuu" ],
-	monthNamesShort: [ "Tammi","Helmi","Maalis","Huhti","Touko","Kesä",
-	"Heinä","Elo","Syys","Loka","Marras","Joulu" ],
-	dayNamesShort: [ "Su","Ma","Ti","Ke","To","Pe","La" ],
-	dayNames: [ "Sunnuntai","Maanantai","Tiistai","Keskiviikko","Torstai","Perjantai","Lauantai" ],
-	dayNamesMin: [ "Su","Ma","Ti","Ke","To","Pe","La" ],
+	monthNames: [ "Tammikuu", "Helmikuu", "Maaliskuu", "Huhtikuu", "Toukokuu", "Kesäkuu",
+	"Heinäkuu", "Elokuu", "Syyskuu", "Lokakuu", "Marraskuu", "Joulukuu" ],
+	monthNamesShort: [ "Tammi", "Helmi", "Maalis", "Huhti", "Touko", "Kesä",
+	"Heinä", "Elo", "Syys", "Loka", "Marras", "Joulu" ],
+	dayNamesShort: [ "Su", "Ma", "Ti", "Ke", "To", "Pe", "La" ],
+	dayNames: [ "Sunnuntai", "Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai" ],
+	dayNamesMin: [ "Su", "Ma", "Ti", "Ke", "To", "Pe", "La" ],
 	weekHeader: "Vk",
 	dateFormat: "d.m.yy",
 	firstDay: 1,
@@ -34,4 +37,4 @@ datepicker.setDefaults( datepicker.regional.fi );
 
 return datepicker.regional.fi;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-fr.js b/app/assets/javascripts-jquery-ui/datepicker-fr.js
index 9e39fbd6..42b582bc 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-fr.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-fr.js
@@ -3,6 +3,8 @@
 			  Stéphane Nahmani (sholby@sholby.net),
 			  Stéphane Raimbault  */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -12,7 +14,8 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.fr = {
 	closeText: "Fermer",
@@ -25,7 +28,7 @@ datepicker.regional.fr = {
 		"juil.", "août", "sept.", "oct.", "nov.", "déc." ],
 	dayNames: [ "dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi" ],
 	dayNamesShort: [ "dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam." ],
-	dayNamesMin: [ "D","L","M","M","J","V","S" ],
+	dayNamesMin: [ "D", "L", "M", "M", "J", "V", "S" ],
 	weekHeader: "Sem.",
 	dateFormat: "dd/mm/yy",
 	firstDay: 1,
@@ -36,4 +39,4 @@ datepicker.setDefaults( datepicker.regional.fr );
 
 return datepicker.regional.fr;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-he.js b/app/assets/javascripts-jquery-ui/datepicker-he.js
index fb6238fd..fbe3c40c 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-he.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-he.js
@@ -1,6 +1,8 @@
 /* Hebrew initialisation for the UI Datepicker extension. */
 /* Written by Amir Hardon (ahardon at gmail dot com). */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -10,20 +12,21 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.he = {
 	closeText: "סגור",
-	prevText: "<הקודם",
-	nextText: "הבא>",
+	prevText: "הקודם",
+	nextText: "הבא",
 	currentText: "היום",
-	monthNames: [ "ינואר","פברואר","מרץ","אפריל","מאי","יוני",
-	"יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר" ],
-	monthNamesShort: [ "ינו","פבר","מרץ","אפר","מאי","יוני",
-	"יולי","אוג","ספט","אוק","נוב","דצמ" ],
-	dayNames: [ "ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת" ],
-	dayNamesShort: [ "א'","ב'","ג'","ד'","ה'","ו'","שבת" ],
-	dayNamesMin: [ "א'","ב'","ג'","ד'","ה'","ו'","שבת" ],
+	monthNames: [ "ינואר", "פברואר", "מרץ", "אפריל", "מאי", "יוני",
+	"יולי", "אוגוסט", "ספטמבר", "אוקטובר", "נובמבר", "דצמבר" ],
+	monthNamesShort: [ "ינו", "פבר", "מרץ", "אפר", "מאי", "יוני",
+	"יולי", "אוג", "ספט", "אוק", "נוב", "דצמ" ],
+	dayNames: [ "ראשון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת" ],
+	dayNamesShort: [ "א'", "ב'", "ג'", "ד'", "ה'", "ו'", "שבת" ],
+	dayNamesMin: [ "א'", "ב'", "ג'", "ד'", "ה'", "ו'", "שבת" ],
 	weekHeader: "Wk",
 	dateFormat: "dd/mm/yy",
 	firstDay: 0,
@@ -34,4 +37,4 @@ datepicker.setDefaults( datepicker.regional.he );
 
 return datepicker.regional.he;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-nb_NO.js b/app/assets/javascripts-jquery-ui/datepicker-nb_NO.js
new file mode 100644
index 00000000..19bb0bc2
--- /dev/null
+++ b/app/assets/javascripts-jquery-ui/datepicker-nb_NO.js
@@ -0,0 +1,52 @@
+/* Norwegian Bokmål initialisation for the jQuery UI date picker plugin. */
+/* Written by Bjørn Johansen (post@bjornjohansen.no). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.nb = {
+	closeText: "Lukk",
+	prevText: "Forrige",
+	nextText: "Neste",
+	currentText: "I dag",
+	monthNames: [
+		"januar",
+		"februar",
+		"mars",
+		"april",
+		"mai",
+		"juni",
+		"juli",
+		"august",
+		"september",
+		"oktober",
+		"november",
+		"desember"
+	],
+	monthNamesShort: [ "jan", "feb", "mar", "apr", "mai", "jun", "jul", "aug", "sep", "okt", "nov", "des" ],
+	dayNamesShort: [ "søn", "man", "tir", "ons", "tor", "fre", "lør" ],
+	dayNames: [ "søndag", "mandag", "tirsdag", "onsdag", "torsdag", "fredag", "lørdag" ],
+	dayNamesMin: [ "sø", "ma", "ti", "on", "to", "fr", "lø" ],
+	weekHeader: "Uke",
+	dateFormat: "dd.mm.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ""
+};
+datepicker.setDefaults( datepicker.regional.nb );
+
+return datepicker.regional.nb;
+
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-nl.js b/app/assets/javascripts-jquery-ui/datepicker-nl.js
index 7fcbff1a..535d7fbd 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-nl.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-nl.js
@@ -1,6 +1,8 @@
 /* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Mathias Bynens  */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -10,12 +12,13 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.nl = {
 	closeText: "Sluiten",
-	prevText: "←",
-	nextText: "→",
+	prevText: "Vorig",
+	nextText: "Volgende",
 	currentText: "Vandaag",
 	monthNames: [ "januari", "februari", "maart", "april", "mei", "juni",
 	"juli", "augustus", "september", "oktober", "november", "december" ],
@@ -34,4 +37,4 @@ datepicker.setDefaults( datepicker.regional.nl );
 
 return datepicker.regional.nl;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-ru.js b/app/assets/javascripts-jquery-ui/datepicker-ru.js
index 223e7764..5a8b3b7c 100644
--- a/app/assets/javascripts-jquery-ui/datepicker-ru.js
+++ b/app/assets/javascripts-jquery-ui/datepicker-ru.js
@@ -1,6 +1,8 @@
 /* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Andrew Stromnov (stromnov@gmail.com). */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -10,20 +12,21 @@
 		// Browser globals
 		factory( jQuery.datepicker );
 	}
-}( function( datepicker ) {
+} )( function( datepicker ) {
+"use strict";
 
 datepicker.regional.ru = {
 	closeText: "Закрыть",
-	prevText: "<Пред",
-	nextText: "След>",
+	prevText: "Пред",
+	nextText: "След",
 	currentText: "Сегодня",
-	monthNames: [ "Январь","Февраль","Март","Апрель","Май","Июнь",
-	"Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь" ],
-	monthNamesShort: [ "Янв","Фев","Мар","Апр","Май","Июн",
-	"Июл","Авг","Сен","Окт","Ноя","Дек" ],
-	dayNames: [ "воскресенье","понедельник","вторник","среда","четверг","пятница","суббота" ],
-	dayNamesShort: [ "вск","пнд","втр","срд","чтв","птн","сбт" ],
-	dayNamesMin: [ "Вс","Пн","Вт","Ср","Чт","Пт","Сб" ],
+	monthNames: [ "Январь", "Февраль", "Март", "Апрель", "Май", "Июнь",
+	"Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь" ],
+	monthNamesShort: [ "Янв", "Фев", "Мар", "Апр", "Май", "Июн",
+	"Июл", "Авг", "Сен", "Окт", "Ноя", "Дек" ],
+	dayNames: [ "воскресенье", "понедельник", "вторник", "среда", "четверг", "пятница", "суббота" ],
+	dayNamesShort: [ "вск", "пнд", "втр", "срд", "чтв", "птн", "сбт" ],
+	dayNamesMin: [ "Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб" ],
 	weekHeader: "Нед",
 	dateFormat: "dd.mm.yy",
 	firstDay: 1,
@@ -34,4 +37,4 @@ datepicker.setDefaults( datepicker.regional.ru );
 
 return datepicker.regional.ru;
 
-} ) );
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-sv.js b/app/assets/javascripts-jquery-ui/datepicker-sv.js
new file mode 100644
index 00000000..ee9296ea
--- /dev/null
+++ b/app/assets/javascripts-jquery-ui/datepicker-sv.js
@@ -0,0 +1,40 @@
+/* Swedish initialisation for the jQuery UI date picker plugin. */
+/* Written by Anders Ekdahl ( anders@nomadiz.se). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.sv = {
+	closeText: "Stäng",
+	prevText: "Förra",
+	nextText: "Nästa",
+	currentText: "Idag",
+	monthNames: [ "januari", "februari", "mars", "april", "maj", "juni",
+	"juli", "augusti", "september", "oktober", "november", "december" ],
+	monthNamesShort: [ "jan.", "feb.", "mars", "apr.", "maj", "juni",
+	"juli", "aug.", "sep.", "okt.", "nov.", "dec." ],
+	dayNamesShort: [ "sön", "mån", "tis", "ons", "tor", "fre", "lör" ],
+	dayNames: [ "söndag", "måndag", "tisdag", "onsdag", "torsdag", "fredag", "lördag" ],
+	dayNamesMin: [ "sö", "må", "ti", "on", "to", "fr", "lö" ],
+	weekHeader: "Ve",
+	dateFormat: "yy-mm-dd",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.sv );
+
+return datepicker.regional.sv;
+
+} );
diff --git a/app/assets/javascripts-jquery-ui/datepicker-tr.js b/app/assets/javascripts-jquery-ui/datepicker-tr.js
new file mode 100644
index 00000000..32eb3edd
--- /dev/null
+++ b/app/assets/javascripts-jquery-ui/datepicker-tr.js
@@ -0,0 +1,40 @@
+/* Turkish initialisation for the jQuery UI date picker plugin. */
+/* Written by Izzet Emre Erkan (kara@karalamalar.net). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.tr = {
+	closeText: "kapat",
+	prevText: "geri",
+	nextText: "ileri",
+	currentText: "bugün",
+	monthNames: [ "Ocak", "Şubat", "Mart", "Nisan", "Mayıs", "Haziran",
+	"Temmuz", "Ağustos", "Eylül", "Ekim", "Kasım", "Aralık" ],
+	monthNamesShort: [ "Oca", "Şub", "Mar", "Nis", "May", "Haz",
+	"Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara" ],
+	dayNames: [ "Pazar", "Pazartesi", "Salı", "Çarşamba", "Perşembe", "Cuma", "Cumartesi" ],
+	dayNamesShort: [ "Pz", "Pt", "Sa", "Ça", "Pe", "Cu", "Ct" ],
+	dayNamesMin: [ "Pz", "Pt", "Sa", "Ça", "Pe", "Cu", "Ct" ],
+	weekHeader: "Hf",
+	dateFormat: "dd.mm.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.tr );
+
+return datepicker.regional.tr;
+
+} );

From ca543865233f109a1849286d6f9ef76fa8fad9d7 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sun, 14 Aug 2022 01:46:34 +0300
Subject: [PATCH 488/767] Update package versions

---
 Gemfile      |   6 +--
 Gemfile.lock | 136 +++++++++++++++++++++++++--------------------------
 2 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/Gemfile b/Gemfile
index d7702326..d6867207 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'coffee-rails', '~> 5.0.0'
 gem 'jquery-rails', '~> 4.5'
 gem 'jquery-ui-rails', '~>6.0.1'
 
-gem 'rails', '~> 6.0.4'
+gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
@@ -37,7 +37,7 @@ gem 'mysql2', '~> 0.5.4', group: :mysql
 gem 'pg', '~> 1.4.3', group: :postgresql
 
 group :development do
-  gem 'spring'
+  gem 'spring', '~> 3'
   gem 'yard'
 
   gem 'tolk', '~> 4.3.0'
@@ -59,7 +59,7 @@ group :test do
 
   # get test coverage info on codeclimate
   gem 'codeclimate-test-reporter', '1.0.7', group: :test, require: nil
-  gem 'database_cleaner'
+  gem 'database_cleaner', '~> 1'
   gem 'factory_bot_rails'
   gem 'minitest-stub-const'
   gem 'mocha', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 389ac8b4..8f889933 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,26 +4,26 @@ GEM
     RedCloth (4.3.2)
     aasm (5.3.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.0.4.7)
-      actionpack (= 6.0.4.7)
+    actioncable (6.0.5.1)
+      actionpack (= 6.0.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.7)
-      actionpack (= 6.0.4.7)
-      activejob (= 6.0.4.7)
-      activerecord (= 6.0.4.7)
-      activestorage (= 6.0.4.7)
-      activesupport (= 6.0.4.7)
+    actionmailbox (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activejob (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      activestorage (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.7)
-      actionpack (= 6.0.4.7)
-      actionview (= 6.0.4.7)
-      activejob (= 6.0.4.7)
+    actionmailer (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      actionview (= 6.0.5.1)
+      activejob (= 6.0.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.7)
-      actionview (= 6.0.4.7)
-      activesupport (= 6.0.4.7)
+    actionpack (6.0.5.1)
+      actionview (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
@@ -31,36 +31,36 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.0.4.7)
-      actionpack (= 6.0.4.7)
-      activerecord (= 6.0.4.7)
-      activestorage (= 6.0.4.7)
-      activesupport (= 6.0.4.7)
+    actiontext (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      activestorage (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.7)
-      activesupport (= 6.0.4.7)
+    actionview (6.0.5.1)
+      activesupport (= 6.0.5.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4.7)
-      activesupport (= 6.0.4.7)
+    activejob (6.0.5.1)
+      activesupport (= 6.0.5.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.7)
-      activesupport (= 6.0.4.7)
+    activemodel (6.0.5.1)
+      activesupport (= 6.0.5.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.4.7)
-      activemodel (= 6.0.4.7)
-      activesupport (= 6.0.4.7)
-    activestorage (6.0.4.7)
-      actionpack (= 6.0.4.7)
-      activejob (= 6.0.4.7)
-      activerecord (= 6.0.4.7)
-      marcel (~> 1.0.0)
-    activesupport (6.0.4.7)
+    activerecord (6.0.5.1)
+      activemodel (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
+    activestorage (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activejob (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      marcel (~> 1.0)
+    activesupport (6.0.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -69,8 +69,8 @@ GEM
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
     ast (2.4.2)
-    autoprefixer-rails (10.1.0.0)
-      execjs
+    autoprefixer-rails (10.4.7.0)
+      execjs (~> 2)
     backport (1.2.0)
     bcrypt (3.1.18)
     benchmark (0.2.0)
@@ -86,7 +86,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.0.2)
+    bullet (7.0.3)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -102,13 +102,13 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    database_cleaner (1.8.5)
+    database_cleaner (1.99.0)
     diff-lcs (1.5.0)
-    docile (1.3.4)
+    docile (1.4.0)
     e2mmap (0.1.0)
-    erubi (1.10.0)
-    execjs (2.7.0)
-    factory_bot (6.2.0)
+    erubi (1.11.0)
+    execjs (2.8.1)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
@@ -188,20 +188,20 @@ GEM
       rack (>= 1.2.0)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (6.0.4.7)
-      actioncable (= 6.0.4.7)
-      actionmailbox (= 6.0.4.7)
-      actionmailer (= 6.0.4.7)
-      actionpack (= 6.0.4.7)
-      actiontext (= 6.0.4.7)
-      actionview (= 6.0.4.7)
-      activejob (= 6.0.4.7)
-      activemodel (= 6.0.4.7)
-      activerecord (= 6.0.4.7)
-      activestorage (= 6.0.4.7)
-      activesupport (= 6.0.4.7)
+    rails (6.0.5.1)
+      actioncable (= 6.0.5.1)
+      actionmailbox (= 6.0.5.1)
+      actionmailer (= 6.0.5.1)
+      actionpack (= 6.0.5.1)
+      actiontext (= 6.0.5.1)
+      actionview (= 6.0.5.1)
+      activejob (= 6.0.5.1)
+      activemodel (= 6.0.5.1)
+      activerecord (= 6.0.5.1)
+      activestorage (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.4.7)
+      railties (= 6.0.5.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -217,15 +217,15 @@ GEM
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (6.0.4.7)
-      actionpack (= 6.0.4.7)
-      activesupport (= 6.0.4.7)
+    railties (6.0.5.1)
+      actionpack (= 6.0.5.1)
+      activesupport (= 6.0.5.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
@@ -237,14 +237,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.34.1)
+    rubocop (1.35.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.21.0)
@@ -267,7 +267,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
     solargraph (0.45.0)
       backport (~> 1.2)
@@ -285,7 +285,7 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     spring (3.1.1)
-    sprockets (4.0.3)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -340,7 +340,7 @@ DEPENDENCIES
   byebug
   codeclimate-test-reporter (= 1.0.7)
   coffee-rails (~> 5.0.0)
-  database_cleaner
+  database_cleaner (~> 1)
   factory_bot_rails
   font-awesome-sass (~> 6.1.2)
   htmlentities
@@ -355,7 +355,7 @@ DEPENDENCIES
   pg (~> 1.4.3)
   puma (~> 5.6)
   rack-mini-profiler
-  rails (~> 6.0.4)
+  rails (~> 6.0.0)
   rails-controller-testing
   rails-dom-testing (~> 2.0.0)
   rails_autolink
@@ -365,7 +365,7 @@ DEPENDENCIES
   sassc-rails (~> 2.1.2)
   simplecov
   solargraph
-  spring
+  spring (~> 3)
   sqlite3
   therubyracer
   tolk (~> 4.3.0)
@@ -375,4 +375,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.22
+   2.2.33

From 4ab8837c2c0fb590304f1e75cda17fbff97e72cb Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sun, 14 Aug 2022 10:56:20 +0300
Subject: [PATCH 489/767] Fix the new locale test breaking other tests because
 of the locale user bleeding to other tests (models)

---
 test/integration/locale_test.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/integration/locale_test.rb b/test/integration/locale_test.rb
index 084f88fd..409718b3 100644
--- a/test/integration/locale_test.rb
+++ b/test/integration/locale_test.rb
@@ -17,6 +17,9 @@ class LocaleTest < ActionDispatch::IntegrationTest
       assert_response :success
       assert_template "todos/index"
     end
+
+    # Finally log in as normal admin user to prevent other tests from failing to the non-English locale.
+    logs_in_as(users(:admin_user), 'abracadabra')
   end
 
 end

From f599cafff880cc1133e1df2143db5dcbe52fdc9f Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sun, 14 Aug 2022 11:41:14 +0300
Subject: [PATCH 490/767] Version 2.6.1

---
 config/initializers/tracks.rb |  2 +-
 doc/CHANGELOG.md              | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb
index 8816d318..77d12eac 100644
--- a/config/initializers/tracks.rb
+++ b/config/initializers/tracks.rb
@@ -1,3 +1,3 @@
-TRACKS_VERSION='2.6.0'
+TRACKS_VERSION='2.6.1'
 TRACKS_REVISION_WITH_DATE=`git log --date=format:'%Y-%m-%d' --pretty=format:"%h @ %ad" -1`
 TRACKS_REVISION=`git log --pretty=format:"%h" -1`
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index e62628cd..e051dee1 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,13 +1,33 @@
 See doc/upgrading.md for the upgrade documentation!
 
+## Version 2.6.1
+
+### Deprecations
+
+* This will be the last release to support Ruby 2.6, which is already end-of-life.
+
+### Bug fixes
+
+* Lots of dependencies have been updated (including security updates).
+* Fixed some documentation.
+* Updated and added missing Datepicker localisations which caused some locales to fail.
+* Added PostgreSQL documentation (thanks Sean Pappalardo!)
+* URL options can be specified to make autocompletion work behind a proxy (thanks Michal Koutný!)
+
+### Updated translations
+
+* Finnish (by maintainer Jyri-Petteri ”ZeiP” Paloposki)
+* Spanish (thanks Francisco Serrador!)
+* Norwegian Bokmål (thanks Allan Nordhøy!)
+
 ## Version 2.6.0
 
-## New features
+### New features
 
 * Ruby 3.0 is now supported.
 * Support obsidian links in notes.
 
-## Removed features
+### Removed features
 
 * No longer supporting EOL Ruby 2.5
 
@@ -19,7 +39,7 @@ See doc/upgrading.md for the upgrade documentation!
 * Fixed import in the Docker image.
 * Footer shows the Git version hash and date in the Docker image
 
-## Updated translations
+### Updated translations
 
 * Finnish (by maintainer Jyri-Petteri ”ZeiP” Paloposki)
 * Turkish (thanks Burak Ekseli!)

From a34922f59b5d53e5215a3b32937381c17c15b711 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sun, 14 Aug 2022 14:06:36 +0300
Subject: [PATCH 491/767] No longer test for Ruby 2.6

---
 .github/workflows/continuous-integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index eb9ce9fd..f66ed13c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.6", "2.7", "3.0"]
+        ruby: ["2.7", "3.0"]
         db: [sqlite, mysql, postgres]
         exclude:
           - ruby: "2.6"

From ef99075c917367d5d5e498bbc9bc9673b82c65d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Aug 2022 11:08:33 +0000
Subject: [PATCH 492/767] Bump spring from 3.1.1 to 4.0.0

Bumps [spring](https://github.com/rails/spring) from 3.1.1 to 4.0.0.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v3.1.1...v4.0.0)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d6867207..fb7d16d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem 'mysql2', '~> 0.5.4', group: :mysql
 gem 'pg', '~> 1.4.3', group: :postgresql
 
 group :development do
-  gem 'spring', '~> 3'
+  gem 'spring', '~> 4'
   gem 'yard'
 
   gem 'tolk', '~> 4.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f889933..a660a670 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -284,7 +284,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    spring (3.1.1)
+    spring (4.0.0)
     sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -365,7 +365,7 @@ DEPENDENCIES
   sassc-rails (~> 2.1.2)
   simplecov
   solargraph
-  spring (~> 3)
+  spring (~> 4)
   sqlite3
   therubyracer
   tolk (~> 4.3.0)

From 21e1009ad782078a4449027dcc8961ad445bd159 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 16 Aug 2022 00:45:34 +0300
Subject: [PATCH 493/767] Automatically build latest Docker image

---
 .github/workflows/build-docker-image.yml | 47 ++++++++++++++++++++++++
 test-envs/docker-compose-2.6-mysql.yml   | 29 ---------------
 2 files changed, 47 insertions(+), 29 deletions(-)
 create mode 100644 .github/workflows/build-docker-image.yml
 delete mode 100644 test-envs/docker-compose-2.6-mysql.yml

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
new file mode 100644
index 00000000..8334fbe4
--- /dev/null
+++ b/.github/workflows/build-docker-image.yml
@@ -0,0 +1,47 @@
+name: 'build'
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  build-and-publish-latest:
+    name: 'Build latest'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2 # Checking out the repo
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            tracksapp/tracks:latest
+            tracksapp/tracks:master
+            ghcr.io/TracksApp/tracks:latest
+
+#ghcr.io/TracksApp/tracks:1.0.0
+#tracksapp/tracks:1.0.0
diff --git a/test-envs/docker-compose-2.6-mysql.yml b/test-envs/docker-compose-2.6-mysql.yml
deleted file mode 100644
index 8af77f50..00000000
--- a/test-envs/docker-compose-2.6-mysql.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-version: '3'
-services:
-  db:
-    image: mysql:5.7
-    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: 1
-      MYSQL_DATABASE: ${TRACKS_DB:-tracks}
-    volumes:
-      - db-data:/var/lib/mysql
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile-2.6
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: $DATABASE_NAME
-      DATABASE_USERNAME: root
-      DATABASE_PASSWORD_EMPTY: 1
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
-    depends_on:
-      - db
-volumes:
-  db-data:

From 84cc264a9ce0f3a06429f62339be7f7f2f25b04a Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 16 Aug 2022 00:46:37 +0300
Subject: [PATCH 494/767] Fix the repository name

---
 .github/workflows/build-docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 8334fbe4..85ff5f96 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -41,7 +41,7 @@ jobs:
           tags: |
             tracksapp/tracks:latest
             tracksapp/tracks:master
-            ghcr.io/TracksApp/tracks:latest
+            ghcr.io/tracksapp/tracks:latest
 
 #ghcr.io/TracksApp/tracks:1.0.0
 #tracksapp/tracks:1.0.0

From 36a27c3a137852cf509a2dce5dbb42b6b2f25a9b Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 16 Aug 2022 01:43:02 +0300
Subject: [PATCH 495/767] Try without the platform

---
 .github/workflows/build-docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 85ff5f96..902b446b 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -36,12 +36,12 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             tracksapp/tracks:latest
             tracksapp/tracks:master
             ghcr.io/tracksapp/tracks:latest
 
+#          platforms: linux/amd64,linux/arm64
 #ghcr.io/TracksApp/tracks:1.0.0
 #tracksapp/tracks:1.0.0

From d40d7db1b5873c46a3e57d32aaf3abf349a722c5 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 16 Aug 2022 02:26:45 +0300
Subject: [PATCH 496/767] Add automatic building for releases

---
 ...uild-docker-image.yml => build-latest.yml} |  7 +--
 .github/workflows/build-release.yml           | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)
 rename .github/workflows/{build-docker-image.yml => build-latest.yml} (92%)
 create mode 100644 .github/workflows/build-release.yml

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-latest.yml
similarity index 92%
rename from .github/workflows/build-docker-image.yml
rename to .github/workflows/build-latest.yml
index 902b446b..53bf9d34 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-latest.yml
@@ -1,10 +1,9 @@
-name: 'build'
-
+---
+name: 'Build latest'
 on:
   push:
     branches:
     - master
-  pull_request:
 
 jobs:
   build-and-publish-latest:
@@ -43,5 +42,3 @@ jobs:
             ghcr.io/tracksapp/tracks:latest
 
 #          platforms: linux/amd64,linux/arm64
-#ghcr.io/TracksApp/tracks:1.0.0
-#tracksapp/tracks:1.0.0
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
new file mode 100644
index 00000000..ccc9a016
--- /dev/null
+++ b/.github/workflows/build-release.yml
@@ -0,0 +1,43 @@
+---
+name: 'Build release'
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build-and-publish-release:
+    name: 'Build release'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2 # Checking out the repo
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          tags: |
+            tracksapp/tracks:${{ github.event.release.name }}
+            ghcr.io/tracksapp/tracks:${{ github.event.release.name }}
+
+#          platforms: linux/amd64,linux/arm64

From 2be637754f2d6fe78ef72e4cce240e4c1b1fa3ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 00:02:49 +0000
Subject: [PATCH 497/767] Bump rubocop from 1.35.0 to 1.35.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.35.0 to 1.35.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.35.0...v1.35.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index fb7d16d4..18cb5ae1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.34', require: false
+  gem 'rubocop', '~> 1.35', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index a660a670..aef76d8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,7 +237,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.35.0)
+    rubocop (1.35.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -360,7 +360,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.34)
+  rubocop (~> 1.35)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From ad62bb28c251a40e13c7af155bf9ee11c3624c1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 00:02:59 +0000
Subject: [PATCH 498/767] Bump solargraph from 0.45.0 to 0.46.0

Bumps [solargraph](https://github.com/castwide/solargraph) from 0.45.0 to 0.46.0.
- [Release notes](https://github.com/castwide/solargraph/releases)
- [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md)
- [Commits](https://github.com/castwide/solargraph/compare/v0.45.0...v0.46.0)

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a660a670..bf57135b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -269,7 +269,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.45.0)
+    solargraph (0.46.0)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)

From 4f2671e1a82bd13ad58c8f97807133af03d9724e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Aug 2022 00:02:32 +0000
Subject: [PATCH 499/767] Bump puma from 5.6.4 to 5.6.5

Bumps [puma](https://github.com/puma/puma) from 5.6.4 to 5.6.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.4...v5.6.5)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a660a670..df6bc154 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
     parser (3.1.2.1)
       ast (~> 2.4.1)
     pg (1.4.3)
-    puma (5.6.4)
+    puma (5.6.5)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.4)

From f2476df3e8122f1d297ae47f471d5f2b5c2f5ad6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Aug 2022 19:53:55 +0000
Subject: [PATCH 500/767] Bump font-awesome-sass from 6.1.2 to 6.2.0

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.1.2 to 6.2.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index fb7d16d4..60172293 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.1.2'
+gem 'font-awesome-sass', '~> 6.2.0'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a660a670..bf9aa4c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (6.1.2)
+    font-awesome-sass (6.2.0)
       sassc (~> 2.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
@@ -180,7 +180,7 @@ GEM
     parser (3.1.2.1)
       ast (~> 2.4.1)
     pg (1.4.3)
-    puma (5.6.4)
+    puma (5.6.5)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.4)
@@ -269,7 +269,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.45.0)
+    solargraph (0.46.0)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -342,7 +342,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.1.2)
+  font-awesome-sass (~> 6.2.0)
   htmlentities
   i18n-tasks (~> 1.0.11)
   jquery-rails (~> 4.5)

From 22c9bba7545ba090642217c72aff7e6077de5c11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 00:03:17 +0000
Subject: [PATCH 501/767] Bump rubocop from 1.35.1 to 1.36.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.35.1 to 1.36.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.35.1...v1.36.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 036fef3b..0a79ac10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.35', require: false
+  gem 'rubocop', '~> 1.36', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 651a4d45..d33064f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,7 +237,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.35.1)
+    rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -360,7 +360,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.35)
+  rubocop (~> 1.36)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 7bea9f2f3d0652f840a89123a49a9db02a2ee887 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Wed, 7 Sep 2022 14:55:34 +0300
Subject: [PATCH 502/767] Add CII best practices badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0f6ae2a6..e96a9b99 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions)
 [![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks)
 [![Translation status](https://hosted.weblate.org/widgets/tracks/-/tracks/svg-badge.svg)](https://hosted.weblate.org/engage/tracks/)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6459/badge)](https://bestpractices.coreinfrastructure.org/projects/6459)
 
 ## About
 

From 23b60f2099f9bc3f993e6b8a7f4d987242a0e3ec Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Wed, 7 Sep 2022 15:09:41 +0300
Subject: [PATCH 503/767] Document coding style and adding tests

---
 CONTRIBUTING.md | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3461dc93..f3c6ffc5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,13 +19,15 @@ It would be great to first discuss them on the [mailing list](https://groups.goo
 If you want to contribute an enhancement or a fix, you can:
 
 1. [fork the project](https://help.github.com/articles/fork-a-repo) 
-1. [create a topic branch](http://learn.github.com/p/branching.html).
-1. install [docker-compose](https://docs.docker.com/compose/)
-1. copy `app/config/site.yml.tmpl` to `app/config/site.yml` and customize as needed
-1. then with `./bin/setup` you will prepare for the first run
-1. start the server with `./script/server` which will start everything you need in Docker and present Tracks at [http://0.0.0.0:3000](http://0.0.0.0:3000)
-1. if you need, you can launch a Rails console with `./bin/rails c` (will run inside Docker)
-1. make your changes and add/update relevant tests
-1. run the test suite with `./bin/rake test` (will run inside Docker)
-1. commit the changes
-1. send a pull request.
+2. [create a topic branch](http://learn.github.com/p/branching.html).
+3. install [docker-compose](https://docs.docker.com/compose/)
+4. copy `app/config/site.yml.tmpl` to `app/config/site.yml` and customize as needed
+5. then with `./bin/setup` you will prepare for the first run
+6. start the server with `./script/server` which will start everything you need in Docker and present Tracks at [http://0.0.0.0:3000](http://0.0.0.0:3000)
+7. if you need, you can launch a Rails console with `./bin/rails c` (will run inside Docker)
+8. make your changes and add/update relevant tests
+9. run the test suite with `./bin/rake test` (will run inside Docker)
+10. commit the changes
+11. send a pull request.
+
+Make sure that you've added the necessary tests for any new functionality and preferably also for any bugs and that your contribution conforms to the coding style defined by the CodeClimate checks. The coding style definition should be approximately the same as the [Shopify Ruby Style Guide](https://ruby-style-guide.shopify.dev/).

From dc1b8f4ac6543885539388b3c69477a1d1dcd46f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:02:30 +0000
Subject: [PATCH 504/767] Bump rspec-expectations from 3.11.0 to 3.11.1

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.11.0...v3.11.1)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d33064f2..1eab7739 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -233,10 +233,10 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)

From 11010b3008fec24900cae60411a5211589ef7c05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 00:06:13 +0000
Subject: [PATCH 505/767] Bump aasm from 5.3.0 to 5.3.1

Bumps [aasm](https://github.com/aasm/aasm) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/aasm/aasm/releases)
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/commits)

---
updated-dependencies:
- dependency-name: aasm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0a79ac10..f20ebab2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'font-awesome-sass', '~> 6.2.0'
 
 gem 'uglifier', '>=1.3.0'
 
-gem 'aasm', '~> 5.3.0'
+gem 'aasm', '~> 5.3.1'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
diff --git a/Gemfile.lock b/Gemfile.lock
index d33064f2..74054251 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    aasm (5.3.0)
+    aasm (5.3.1)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.5.1)
       actionpack (= 6.0.5.1)
@@ -330,7 +330,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  aasm (~> 5.3.0)
+  aasm (~> 5.3.1)
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list

From f54455c845d8274f54a44ad57cd60b67ec601375 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 06:55:58 +0000
Subject: [PATCH 506/767] Bump i18n-tasks from 1.0.11 to 1.0.12

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.11 to 1.0.12.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.11...v1.0.12)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  4 ++--
 Gemfile.lock | 28 +++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0a79ac10..2e3bd266 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'font-awesome-sass', '~> 6.2.0'
 
 gem 'uglifier', '>=1.3.0'
 
-gem 'aasm', '~> 5.3.0'
+gem 'aasm', '~> 5.3.1'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
@@ -46,7 +46,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 1.0.11'
+  gem 'i18n-tasks', '~> 1.0.12'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index d33064f2..f2ce21f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    aasm (5.3.0)
+    aasm (5.3.1)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.5.1)
       actionpack (= 6.0.5.1)
@@ -74,12 +74,11 @@ GEM
     backport (1.2.0)
     bcrypt (3.1.18)
     benchmark (0.2.0)
-    better_html (1.0.16)
-      actionview (>= 4.0)
-      activesupport (>= 4.0)
+    better_html (2.0.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
-      html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
     bootstrap-sass (3.4.1)
@@ -119,14 +118,13 @@ GEM
     globalid (1.0.0)
       activesupport (>= 5.0)
     highline (2.0.3)
-    html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.11)
+    i18n-tasks (1.0.12)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      better_html (~> 1.0)
+      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -156,7 +154,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.18.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -168,7 +166,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     minitest-stub-const (0.6)
     mocha (1.14.0)
     mysql2 (0.5.4)
@@ -233,10 +231,10 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -314,7 +312,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
     uniform_notifier (1.16.0)
     webrick (1.7.0)
     websocket-driver (0.7.5)
@@ -330,7 +328,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  aasm (~> 5.3.0)
+  aasm (~> 5.3.1)
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
@@ -344,7 +342,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 6.2.0)
   htmlentities
-  i18n-tasks (~> 1.0.11)
+  i18n-tasks (~> 1.0.12)
   jquery-rails (~> 4.5)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.1)

From abc4fc7b22d62d3c68df1e7629a02cd6f499635b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 00:03:03 +0000
Subject: [PATCH 507/767] Bump spring from 4.0.0 to 4.1.0

Bumps [spring](https://github.com/rails/spring) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f2ce21f9..fc1fb56a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -282,7 +282,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    spring (4.0.0)
+    spring (4.1.0)
     sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

From 7010d8831311e761922dc189fe1845b749a1efe4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 00:03:16 +0000
Subject: [PATCH 508/767] Bump mocha from 1.14.0 to 1.15.0

Bumps [mocha](https://github.com/freerange/mocha) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/freerange/mocha/releases)
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v1.14.0...v1.15.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f2ce21f9..2d864076 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     mini_portile2 (2.8.0)
     minitest (5.16.3)
     minitest-stub-const (0.6)
-    mocha (1.14.0)
+    mocha (1.15.0)
     mysql2 (0.5.4)
     nio4r (2.5.8)
     nokogiri (1.13.8)

From 82bc9d741740f44da73fb263c5e4ebc6516d7b21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 00:09:44 +0000
Subject: [PATCH 509/767] Bump solargraph from 0.46.0 to 0.47.0

Bumps [solargraph](https://github.com/castwide/solargraph) from 0.46.0 to 0.47.0.
- [Release notes](https://github.com/castwide/solargraph/releases)
- [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md)
- [Commits](https://github.com/castwide/solargraph/compare/v0.46.0...v0.47.0)

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a8dabeec..0efc73df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -267,7 +267,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.46.0)
+    solargraph (0.47.0)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)

From 7d67195322e0dea2bc274e2be513803dc9f23126 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 00:07:21 +0000
Subject: [PATCH 510/767] Bump solargraph from 0.47.0 to 0.47.2

Bumps [solargraph](https://github.com/castwide/solargraph) from 0.47.0 to 0.47.2.
- [Release notes](https://github.com/castwide/solargraph/releases)
- [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md)
- [Commits](https://github.com/castwide/solargraph/compare/v0.47.0...v0.47.2)

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0efc73df..e0a6f75d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -227,7 +227,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -267,7 +267,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.47.0)
+    solargraph (0.47.2)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)

From be45b47f2ea8e5452a8ab168433f30f61cd1178b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 00:08:08 +0000
Subject: [PATCH 511/767] Bump sqlite3 from 1.4.4 to 1.5.2

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.4.4 to 1.5.2.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.4.4...v1.5.2)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0efc73df..c2819c99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,7 +290,8 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.4)
+    sqlite3 (1.5.2)
+      mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)

From 7c7f1b5a762b3c917dac1e980071e95c19fa86c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Oct 2022 00:03:10 +0000
Subject: [PATCH 512/767] Bump codeclimate-test-reporter from 1.0.7 to 1.0.9

Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter) from 1.0.7 to 1.0.9.
- [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases)
- [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.7...v1.0.9)

---
updated-dependencies:
- dependency-name: codeclimate-test-reporter
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2e3bd266..d3f78959 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,7 @@ end
 group :test do
 
   # get test coverage info on codeclimate
-  gem 'codeclimate-test-reporter', '1.0.7', group: :test, require: nil
+  gem 'codeclimate-test-reporter', '1.0.9', group: :test, require: nil
   gem 'database_cleaner', '~> 1'
   gem 'factory_bot_rails'
   gem 'minitest-stub-const'
diff --git a/Gemfile.lock b/Gemfile.lock
index c3b4939f..ea358604 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,8 +90,8 @@ GEM
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
     climate_control (0.2.0)
-    codeclimate-test-reporter (1.0.7)
-      simplecov
+    codeclimate-test-reporter (1.0.9)
+      simplecov (<= 0.13)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
       railties (>= 5.2.0)
@@ -103,7 +103,7 @@ GEM
     crass (1.0.6)
     database_cleaner (1.99.0)
     diff-lcs (1.5.0)
-    docile (1.4.0)
+    docile (1.1.5)
     e2mmap (0.1.0)
     erubi (1.11.0)
     execjs (2.8.1)
@@ -260,12 +260,11 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     smart_properties (1.17.0)
     solargraph (0.47.2)
       backport (~> 1.2)
@@ -337,7 +336,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.4.1)
   bullet
   byebug
-  codeclimate-test-reporter (= 1.0.7)
+  codeclimate-test-reporter (= 1.0.9)
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails

From 3fd631ac6a81bb37216405276f0e012564962305 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Oct 2022 19:33:22 +0300
Subject: [PATCH 513/767] Fix the MySQL user creation clause in the
 installation documentation.

Fixes #2843.
---
 doc/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/installation.md b/doc/installation.md
index 7bb7375b..375997e8 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -58,7 +58,7 @@ Tracks container. In future there should be an official image in Docker Hub. You
    # MySQL
    $ mysql -u root -p
    mysql> CREATE DATABASE tracks;
-   mysql> GRANT ALL PRIVILEGES ON tracks.* TO yourmysqluser@localhost IDENTIFIED BY 'password-goes-here' WITH GRANT OPTION;
+   mysql> GRANT ALL PRIVILEGES ON tracks.* TO yourmysqluser@'%' IDENTIFIED BY 'password-goes-here' WITH GRANT OPTION;
 
    # PostgreSQL
    $ sudo -u postgres psql

From 226c7c2bd8fa5ea0881cb6ff40ab483a3fa23f1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Oct 2022 00:08:43 +0000
Subject: [PATCH 514/767] Bump aasm from 5.3.1 to 5.4.0

Bumps [aasm](https://github.com/aasm/aasm) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/aasm/aasm/releases)
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/commits)

---
updated-dependencies:
- dependency-name: aasm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d3f78959..264caefb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'font-awesome-sass', '~> 6.2.0'
 
 gem 'uglifier', '>=1.3.0'
 
-gem 'aasm', '~> 5.3.1'
+gem 'aasm', '~> 5.4.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
diff --git a/Gemfile.lock b/Gemfile.lock
index ea358604..7d8f13e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    aasm (5.3.1)
+    aasm (5.4.0)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.5.1)
       actionpack (= 6.0.5.1)
@@ -328,7 +328,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  aasm (~> 5.3.1)
+  aasm (~> 5.4.0)
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list

From c5e5f396484e6bd833a70be3c3d5f84c7c877e19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 00:06:02 +0000
Subject: [PATCH 515/767] Bump sqlite3 from 1.5.2 to 1.5.3

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.5.2 to 1.5.3.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.5.2...v1.5.3)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ea358604..0a34b9e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -289,7 +289,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.2)
+    sqlite3 (1.5.3)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 076aba6f8cf459792a1b0e7a6720b1695aa83001 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 00:06:25 +0000
Subject: [PATCH 516/767] Bump pg from 1.4.3 to 1.4.4

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d3f78959..70282151 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.4', group: :mysql
-gem 'pg', '~> 1.4.3', group: :postgresql
+gem 'pg', '~> 1.4.4', group: :postgresql
 
 group :development do
   gem 'spring', '~> 4'
diff --git a/Gemfile.lock b/Gemfile.lock
index ea358604..4b47008d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,7 +177,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.4.3)
+    pg (1.4.4)
     puma (5.6.5)
       nio4r (~> 2.0)
     racc (1.6.0)
@@ -350,7 +350,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.4)
-  pg (~> 1.4.3)
+  pg (~> 1.4.4)
   puma (~> 5.6)
   rack-mini-profiler
   rails (~> 6.0.0)

From 5a98b62cb15abeebfccd6e5dae8e5fd2014db130 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 04:15:34 +0000
Subject: [PATCH 517/767] Bump nokogiri from 1.13.8 to 1.13.9

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ea358604..51e2ed08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -171,7 +171,7 @@ GEM
     mocha (1.15.0)
     mysql2 (0.5.4)
     nio4r (2.5.8)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)

From 9cb844d7a7c79513842d3c8184326009378dabb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 00:06:03 +0000
Subject: [PATCH 518/767] Bump rubocop from 1.36.0 to 1.37.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.36.0 to 1.37.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.36.0...v1.37.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index a6916277..926d691f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.36', require: false
+  gem 'rubocop', '~> 1.37', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index fd5d1d28..5653c334 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -235,17 +235,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.1)
-    rubocop (1.36.0)
+    rubocop (1.37.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.22.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
@@ -358,7 +358,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.36)
+  rubocop (~> 1.37)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From aee0630a81841bb2fad9a9f710609ed05d749bc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 00:06:23 +0000
Subject: [PATCH 519/767] Bump puma from 5.6.5 to 6.0.0

Bumps [puma](https://github.com/puma/puma) from 5.6.5 to 6.0.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.5...v6.0.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a6916277..f760b5d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.1"
-gem 'puma', '~> 5.6'
+gem 'puma', '~> 6.0'
 gem 'rails_autolink'
 gem 'RedCloth'
 gem 'sanitize', '~> 6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index fd5d1d28..fe08593f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,7 +178,7 @@ GEM
     parser (3.1.2.1)
       ast (~> 2.4.1)
     pg (1.4.4)
-    puma (5.6.5)
+    puma (6.0.0)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.4)
@@ -351,7 +351,7 @@ DEPENDENCIES
   mocha
   mysql2 (~> 0.5.4)
   pg (~> 1.4.4)
-  puma (~> 5.6)
+  puma (~> 6.0)
   rack-mini-profiler
   rails (~> 6.0.0)
   rails-controller-testing

From d89f9176b6083ab07f80e695cc7f73046fa06b4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 00:07:05 +0000
Subject: [PATCH 520/767] Bump mocha from 1.15.0 to 1.16.0

Bumps [mocha](https://github.com/freerange/mocha) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/freerange/mocha/releases)
- [Changelog](https://github.com/freerange/mocha/blob/v1.16.0/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v1.15.0...v1.16.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fd5d1d28..59a93727 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     mini_portile2 (2.8.0)
     minitest (5.16.3)
     minitest-stub-const (0.6)
-    mocha (1.15.0)
+    mocha (1.16.0)
     mysql2 (0.5.4)
     nio4r (2.5.8)
     nokogiri (1.13.9)

From baae1f2924fb1b0e574262546b6144dc6c8cf56c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 00:03:03 +0000
Subject: [PATCH 521/767] Bump rubocop from 1.37.0 to 1.37.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.37.0 to 1.37.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.37.0...v1.37.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9031a7f3..1d4e152f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -235,14 +235,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.1)
-    rubocop (1.37.0)
+    rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.22.0, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)

From c91a5ab05c1e9300a8317f47f1e9428af082557e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 00:02:38 +0000
Subject: [PATCH 522/767] Bump rspec-expectations from 3.11.1 to 3.12.0

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.11.1 to 3.12.0.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.11.1...v3.12.0)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1d4e152f..68807c49 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -231,10 +231,10 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec-expectations (3.11.1)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)

From 031230d807ddb38bc8512fc6eb61833846563849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 00:02:04 +0000
Subject: [PATCH 523/767] Bump mocha from 1.16.0 to 2.0.2

Bumps [mocha](https://github.com/freerange/mocha) from 1.16.0 to 2.0.2.
- [Release notes](https://github.com/freerange/mocha/releases)
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v1.16.0...v2.0.2)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68807c49..93818fbe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,8 @@ GEM
     mini_portile2 (2.8.0)
     minitest (5.16.3)
     minitest-stub-const (0.6)
-    mocha (1.16.0)
+    mocha (2.0.2)
+      ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.4)
     nio4r (2.5.8)
     nokogiri (1.13.9)
@@ -248,6 +249,7 @@ GEM
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
     sanitize (6.0.0)
       crass (~> 1.0.2)

From d424d59dbaa6f9a1fcac787e73930122cc51a971 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 00:02:14 +0000
Subject: [PATCH 524/767] Bump rails_autolink from 1.1.6 to 1.1.7

Bumps [rails_autolink](https://github.com/tenderlove/rails_autolink) from 1.1.6 to 1.1.7.
- [Release notes](https://github.com/tenderlove/rails_autolink/releases)
- [Changelog](https://github.com/tenderlove/rails_autolink/blob/master/CHANGELOG.rdoc)
- [Commits](https://github.com/tenderlove/rails_autolink/compare/v1.1.6...v1.1.7)

---
updated-dependencies:
- dependency-name: rails_autolink
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68807c49..1eeaed45 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,7 +213,7 @@ GEM
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    rails_autolink (1.1.6)
+    rails_autolink (1.1.7)
       rails (> 3.1)
     railties (6.0.5.1)
       actionpack (= 6.0.5.1)
@@ -321,7 +321,7 @@ GEM
     will_paginate (3.3.1)
     yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.5)
 
 PLATFORMS
   ruby

From af6fcc8c67d19b196de543a753e6514dd6870e83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Dec 2022 04:07:29 +0000
Subject: [PATCH 525/767] Bump nokogiri from 1.13.9 to 1.13.10

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68807c49..7f590f88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -171,7 +171,7 @@ GEM
     mocha (1.16.0)
     mysql2 (0.5.4)
     nio4r (2.5.8)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -180,7 +180,7 @@ GEM
     pg (1.4.4)
     puma (6.0.0)
       nio4r (~> 2.0)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)

From 98b14f8482859ad430a90a221e100086d4a59333 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Dec 2022 00:01:02 +0000
Subject: [PATCH 526/767] Bump rubocop from 1.37.1 to 1.40.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.37.1 to 1.40.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.37.1...v1.40.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index e6dca819..43ead8e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.37', require: false
+  gem 'rubocop', '~> 1.40', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 68807c49..ab80fd85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -139,7 +139,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.6.2)
+    json (2.6.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -175,7 +175,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     pg (1.4.4)
     puma (6.0.0)
@@ -227,7 +227,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -235,7 +235,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.37.1)
+    rubocop (1.40.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -245,7 +245,7 @@ GEM
       rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
@@ -358,7 +358,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.37)
+  rubocop (~> 1.40)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 967289becc7c31247d1c6e134dd56e287a49668c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 00:03:49 +0000
Subject: [PATCH 527/767] Bump pg from 1.4.4 to 1.4.5

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.4...v1.4.5)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 43ead8e3..12f77178 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.4', group: :mysql
-gem 'pg', '~> 1.4.4', group: :postgresql
+gem 'pg', '~> 1.4.5', group: :postgresql
 
 group :development do
   gem 'spring', '~> 4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8e2545b0..e2ca9675 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,7 +178,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.3.0)
       ast (~> 2.4.1)
-    pg (1.4.4)
+    pg (1.4.5)
     puma (6.0.0)
       nio4r (~> 2.0)
     racc (1.6.1)
@@ -352,7 +352,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.4)
-  pg (~> 1.4.4)
+  pg (~> 1.4.5)
   puma (~> 6.0)
   rack-mini-profiler
   rails (~> 6.0.0)

From 9c2fb152d9eb60c7ddaaf0e6ae825e98aafe5571 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 00:04:03 +0000
Subject: [PATCH 528/767] Bump font-awesome-sass from 6.2.0 to 6.2.1

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 43ead8e3..31533711 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.2.0'
+gem 'font-awesome-sass', '~> 6.2.1'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8e2545b0..03e9d9c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,7 +113,7 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (6.2.0)
+    font-awesome-sass (6.2.1)
       sassc (~> 2.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
@@ -342,7 +342,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.2.0)
+  font-awesome-sass (~> 6.2.1)
   htmlentities
   i18n-tasks (~> 1.0.12)
   jquery-rails (~> 4.5)

From d4a69ce2b0f8da61eeb9b4586ea1e7c30b93ccd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 00:04:31 +0000
Subject: [PATCH 529/767] Bump bullet from 7.0.3 to 7.0.4

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.3 to 7.0.4.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.3...7.0.4)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8e2545b0..1568a386 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.0.3)
+    bullet (7.0.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -323,7 +323,7 @@ GEM
     will_paginate (3.3.1)
     yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.6.5)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

From b194d721895309380f271ed8e499120079847662 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 14:52:46 +0000
Subject: [PATCH 530/767] Bump rails-html-sanitizer from 1.4.3 to 1.4.4

Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8e2545b0..7d123fcd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -209,8 +209,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)

From 878577bf149e5dba1b501d2320e5b552045ed3cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 00:02:06 +0000
Subject: [PATCH 531/767] Bump jquery-rails from 4.5.0 to 4.5.1

Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v4.5.0...v4.5.1)

---
updated-dependencies:
- dependency-name: jquery-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01da0f49..ce7066de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.1.5)
     e2mmap (0.1.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     execjs (2.8.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
@@ -133,7 +133,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     jaro_winkler (1.5.4)
-    jquery-rails (4.5.0)
+    jquery-rails (4.5.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -165,8 +165,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     minitest-stub-const (0.6)
     mocha (2.0.2)
       ruby2_keywords (>= 0.0.5)
@@ -181,8 +181,8 @@ GEM
     pg (1.4.5)
     puma (6.0.0)
       nio4r (~> 2.0)
-    racc (1.6.1)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.5)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (2.0.2)

From f322b546431ec58a918bb91db07543a0b09ce9af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:01:58 +0000
Subject: [PATCH 532/767] Bump rubocop from 1.40.0 to 1.43.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.40.0 to 1.43.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.40.0...v1.43.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 10bfbe61..d35719b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.40', require: false
+  gem 'rubocop', '~> 1.43', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 01da0f49..75274254 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -176,7 +176,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     pg (1.4.5)
     puma (6.0.0)
@@ -236,17 +236,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.40.0)
+    rubocop (1.43.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -314,7 +314,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
     webrick (1.7.0)
     websocket-driver (0.7.5)
@@ -360,7 +360,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.40)
+  rubocop (~> 1.43)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 571f2b4ba2ee02d34e5b5f0d1e22a9bfb9f7ed05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:06:18 +0000
Subject: [PATCH 533/767] Bump sqlite3 from 1.5.3 to 1.5.4

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.5.3 to 1.5.4.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.5.3...v1.5.4)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ce7066de..6537db84 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -291,7 +291,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.3)
+    sqlite3 (1.5.4)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 068edfe5c13c832f59839298b6b31c358de6defc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 00:01:16 +0000
Subject: [PATCH 534/767] Bump bullet from 7.0.4 to 7.0.7

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.4 to 7.0.7.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.4...7.0.7)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e158bf4f..07704083 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.0.4)
+    bullet (7.0.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)

From d039a9f12c96309444735ad5225dc059e8730f9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 00:01:36 +0000
Subject: [PATCH 535/767] Bump listen from 3.7.1 to 3.8.0

Bumps [listen](https://github.com/guard/listen) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.7.1...v3.8.0)

---
updated-dependencies:
- dependency-name: listen
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e158bf4f..34e220d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -151,7 +151,7 @@ GEM
       mime-types
       terrapin (~> 0.6.0)
     libv8 (3.16.14.19)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.19.1)
@@ -224,7 +224,7 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)

From 59790c0236e7d5ed107424f42a36c53379336955 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 00:01:39 +0000
Subject: [PATCH 536/767] Bump puma from 6.0.0 to 6.0.2

Bumps [puma](https://github.com/puma/puma) from 6.0.0 to 6.0.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.0.0...v6.0.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e158bf4f..bb3a189d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,7 +179,7 @@ GEM
     parser (3.2.0.0)
       ast (~> 2.4.1)
     pg (1.4.5)
-    puma (6.0.0)
+    puma (6.0.2)
       nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.2.5)

From 5e369866b151fc3c9a13cca8ef731f36d730bb93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 00:01:43 +0000
Subject: [PATCH 537/767] Bump rspec-expectations from 3.12.0 to 3.12.2

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.12.0 to 3.12.2.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.12.0...v3.12.2)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 36bdeac7..8912c36d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -232,7 +232,7 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)

From 011162849d106c270abdb566d8d788b9f6c9f22a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 00:02:48 +0000
Subject: [PATCH 538/767] Bump tolk from 4.3.0 to 5.0.0

Bumps [tolk](https://github.com/tolk/tolk) from 4.3.0 to 5.0.0.
- [Release notes](https://github.com/tolk/tolk/releases)
- [Changelog](https://github.com/tolk/tolk/blob/v5.0.0/CHANGELOG.md)
- [Commits](https://github.com/tolk/tolk/compare/v4.3.0...v5.0.0)

---
updated-dependencies:
- dependency-name: tolk
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index d35719b8..4042e1ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@ group :development do
   gem 'spring', '~> 4'
   gem 'yard'
 
-  gem 'tolk', '~> 4.3.0'
+  gem 'tolk', '~> 5.0.0'
 
   gem 'bullet'
   gem 'rack-mini-profiler'
diff --git a/Gemfile.lock b/Gemfile.lock
index 36bdeac7..f1832afc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,6 +102,7 @@ GEM
     concurrent-ruby (1.1.10)
     crass (1.0.6)
     database_cleaner (1.99.0)
+    date (3.3.3)
     diff-lcs (1.5.0)
     docile (1.1.5)
     e2mmap (0.1.0)
@@ -115,7 +116,7 @@ GEM
     ffi (1.15.5)
     font-awesome-sass (6.2.1)
       sassc (~> 2.0)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     highline (2.0.3)
     htmlentities (4.3.4)
@@ -157,8 +158,11 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
     mime-types (3.4.1)
@@ -171,8 +175,17 @@ GEM
     mocha (2.0.2)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.4)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.0)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -182,7 +195,7 @@ GEM
     puma (6.0.2)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.5)
+    rack (2.2.6.2)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (2.0.2)
@@ -284,9 +297,9 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     spring (4.1.0)
-    sprockets (4.1.1)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -303,10 +316,10 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.11)
-    tolk (4.3.0)
-      rails (>= 5.0)
+    timeout (0.3.1)
+    tolk (5.0.0)
+      rails (>= 6.0)
       safe_yaml (>= 0.8.6)
-      sassc
       sprockets-rails (~> 3.4)
     tracks-chartjs-ror (3.6.4)
       rails (>= 3.1)
@@ -368,7 +381,7 @@ DEPENDENCIES
   spring (~> 4)
   sqlite3
   therubyracer
-  tolk (~> 4.3.0)
+  tolk (~> 5.0.0)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)
   will_paginate

From 98f94ff1854f26576668d1e33b85af0f1804dfd6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 01:57:46 +0000
Subject: [PATCH 539/767] Bump rack from 2.2.5 to 2.2.6.2

Bumps [rack](https://github.com/rack/rack) from 2.2.5 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.5...v2.2.6.2)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 36bdeac7..b63c25b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
     puma (6.0.2)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.5)
+    rack (2.2.6.2)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (2.0.2)

From a75e8e4cba17238bda1c82acb78be91f5a4e4360 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 22:23:19 +0000
Subject: [PATCH 540/767] Bump globalid from 1.0.0 to 1.0.1

Bumps [globalid](https://github.com/rails/globalid) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/rails/globalid/releases)
- [Commits](https://github.com/rails/globalid/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: globalid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 36bdeac7..4b8798c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,7 +115,7 @@ GEM
     ffi (1.15.5)
     font-awesome-sass (6.2.1)
       sassc (~> 2.0)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     highline (2.0.3)
     htmlentities (4.3.4)

From 81d27edbf07fc22b702ecfc86f4a0cf6127806b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Jan 2023 09:35:50 +0000
Subject: [PATCH 541/767] Bump sqlite3 from 1.5.4 to 1.6.0

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.5.4 to 1.6.0.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.5.4...v1.6.0)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f2a6b8c3..ed1bf795 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.4)
+    sqlite3 (1.6.0)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 228b92677e14a4e89da54f13b3a76db683cab795 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Jan 2023 00:00:54 +0000
Subject: [PATCH 542/767] Bump solargraph from 0.47.2 to 0.48.0

Bumps [solargraph](https://github.com/castwide/solargraph) from 0.47.2 to 0.48.0.
- [Release notes](https://github.com/castwide/solargraph/releases)
- [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md)
- [Commits](https://github.com/castwide/solargraph/compare/v0.47.2...v0.48.0)

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ed1bf795..37e174c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,7 +73,7 @@ GEM
       execjs (~> 2)
     backport (1.2.0)
     bcrypt (3.1.18)
-    benchmark (0.2.0)
+    benchmark (0.2.1)
     better_html (2.0.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -241,7 +241,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.6.1)
+    regexp_parser (2.6.2)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -281,7 +281,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     smart_properties (1.17.0)
-    solargraph (0.47.2)
+    solargraph (0.48.0)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)

From 51c28894439c7bddcaa4d92f77ff87413211bce3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Jan 2023 00:01:12 +0000
Subject: [PATCH 543/767] Bump mysql2 from 0.5.4 to 0.5.5

Bumps [mysql2](https://github.com/brianmario/mysql2) from 0.5.4 to 0.5.5.
- [Release notes](https://github.com/brianmario/mysql2/releases)
- [Commits](https://github.com/brianmario/mysql2/compare/0.5.4...0.5.5)

---
updated-dependencies:
- dependency-name: mysql2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4042e1ef..15ae28ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem 'therubyracer', group: :therubyracer
 
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
-gem 'mysql2', '~> 0.5.4', group: :mysql
+gem 'mysql2', '~> 0.5.5', group: :mysql
 gem 'pg', '~> 1.4.5', group: :postgresql
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index ed1bf795..e31dba61 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -174,7 +174,7 @@ GEM
     minitest-stub-const (0.6)
     mocha (2.0.2)
       ruby2_keywords (>= 0.0.5)
-    mysql2 (0.5.4)
+    mysql2 (0.5.5)
     net-imap (0.3.4)
       date
       net-protocol
@@ -364,7 +364,7 @@ DEPENDENCIES
   listen
   minitest-stub-const
   mocha
-  mysql2 (~> 0.5.4)
+  mysql2 (~> 0.5.5)
   pg (~> 1.4.5)
   puma (~> 6.0)
   rack-mini-profiler

From dc1dc7c73986eb86f7da8735971098a06ded069c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Jan 2023 00:02:03 +0000
Subject: [PATCH 544/767] Bump spring from 4.1.0 to 4.1.1

Bumps [spring](https://github.com/rails/spring) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ed1bf795..56a6b2ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    spring (4.1.0)
+    spring (4.1.1)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)

From 428ee559763eefcd7c2c968c0312985ae0be7ba8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:01:41 +0000
Subject: [PATCH 545/767] Bump acts_as_list from 1.0.4 to 1.1.0

Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.0.4 to 1.1.0.
- [Release notes](https://github.com/brendon/acts_as_list/releases)
- [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brendon/acts_as_list/compare/v1.0.4...v1.1.0)

---
updated-dependencies:
- dependency-name: acts_as_list
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fae1b0b9..c874052a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    acts_as_list (1.0.4)
+    acts_as_list (1.1.0)
       activerecord (>= 4.2)
     ast (2.4.2)
     autoprefixer-rails (10.4.7.0)
@@ -99,7 +99,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crass (1.0.6)
     database_cleaner (1.99.0)
     date (3.3.3)
@@ -323,7 +323,7 @@ GEM
       sprockets-rails (~> 3.4)
     tracks-chartjs-ror (3.6.4)
       rails (>= 3.1)
-    tzinfo (1.2.10)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)

From a00d6d5ca899ebbff4255fc13d5eee9b4333861e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Feb 2023 00:01:08 +0000
Subject: [PATCH 546/767] Bump rubocop from 1.43.0 to 1.45.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.43.0 to 1.45.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.43.0...v1.45.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 15ae28ac..e86efe05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.43', require: false
+  gem 'rubocop', '~> 1.45', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index fae1b0b9..9f051f32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    regexp_parser (2.6.2)
+    regexp_parser (2.7.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -249,7 +249,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.43.0)
+    rubocop (1.45.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -373,7 +373,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.43)
+  rubocop (~> 1.45)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 0557fd3401f57fffdc366efe86bcac274c506a16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Feb 2023 23:19:22 +0000
Subject: [PATCH 547/767] Bump sanitize from 6.0.0 to 6.0.1

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c410796b..6a7924a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.14.0)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -264,7 +264,7 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sanitize (6.0.0)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)

From 54f9379afe8275192bc4c359f430981602365107 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 00:56:49 +0000
Subject: [PATCH 548/767] Bump rails_autolink from 1.1.7 to 1.1.8

Bumps [rails_autolink](https://github.com/tenderlove/rails_autolink) from 1.1.7 to 1.1.8.
- [Release notes](https://github.com/tenderlove/rails_autolink/releases)
- [Changelog](https://github.com/tenderlove/rails_autolink/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tenderlove/rails_autolink/compare/v1.1.7...v1.1.8)

---
updated-dependencies:
- dependency-name: rails_autolink
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c410796b..e805987c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -116,7 +116,7 @@ GEM
     ffi (1.15.5)
     font-awesome-sass (6.2.1)
       sassc (~> 2.0)
-    globalid (1.0.1)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     highline (2.0.3)
     htmlentities (4.3.4)
@@ -158,7 +158,7 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -185,7 +185,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.14.0)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -222,13 +222,15 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    rails_autolink (1.1.7)
-      rails (> 3.1)
+    rails_autolink (1.1.8)
+      actionview (> 3.1)
+      activesupport (> 3.1)
+      railties (> 3.1)
     railties (6.0.5.1)
       actionpack (= 6.0.5.1)
       activesupport (= 6.0.5.1)
@@ -316,7 +318,7 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.11)
-    timeout (0.3.1)
+    timeout (0.3.2)
     tolk (5.0.0)
       rails (>= 6.0)
       safe_yaml (>= 0.8.6)
@@ -336,7 +338,7 @@ GEM
     will_paginate (3.3.1)
     yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

From ca941cf69e2ff81d7eb926ddffb1a38b00619f07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 00:57:08 +0000
Subject: [PATCH 549/767] Bump puma from 6.0.2 to 6.1.0

Bumps [puma](https://github.com/puma/puma) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.0.2...v6.1.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index e86efe05..d5eedeef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.1"
-gem 'puma', '~> 6.0'
+gem 'puma', '~> 6.1'
 gem 'rails_autolink'
 gem 'RedCloth'
 gem 'sanitize', '~> 6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index c410796b..c79c8a9a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
     parser (3.2.0.0)
       ast (~> 2.4.1)
     pg (1.4.5)
-    puma (6.0.2)
+    puma (6.1.0)
       nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.2.6.2)
@@ -366,7 +366,7 @@ DEPENDENCIES
   mocha
   mysql2 (~> 0.5.5)
   pg (~> 1.4.5)
-  puma (~> 6.0)
+  puma (~> 6.1)
   rack-mini-profiler
   rails (~> 6.0.0)
   rails-controller-testing

From f01a3fd2f9fb3d71943accd268313010700854a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Feb 2023 00:14:09 +0000
Subject: [PATCH 550/767] Bump font-awesome-sass from 6.2.1 to 6.3.0

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.2.1 to 6.3.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d5eedeef..093386d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.2.1'
+gem 'font-awesome-sass', '~> 6.3.0'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c5a1699..04c93b01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (6.2.1)
+    font-awesome-sass (6.3.0)
       sassc (~> 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -357,7 +357,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.2.1)
+  font-awesome-sass (~> 6.3.0)
   htmlentities
   i18n-tasks (~> 1.0.12)
   jquery-rails (~> 4.5)

From ea5a4a8ec7e521f9f5e6d536f0b470b733281772 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Feb 2023 00:14:25 +0000
Subject: [PATCH 551/767] Bump aasm from 5.4.0 to 5.5.0

Bumps [aasm](https://github.com/aasm/aasm) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/aasm/aasm/releases)
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/commits)

---
updated-dependencies:
- dependency-name: aasm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d5eedeef..8d6e5da3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'font-awesome-sass', '~> 6.2.1'
 
 gem 'uglifier', '>=1.3.0'
 
-gem 'aasm', '~> 5.4.0'
+gem 'aasm', '~> 5.5.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c5a1699..fbf70814 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    aasm (5.4.0)
+    aasm (5.5.0)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.5.1)
       actionpack (= 6.0.5.1)
@@ -345,7 +345,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  aasm (~> 5.4.0)
+  aasm (~> 5.5.0)
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list

From beb2583679a5d0355ab4fa6aabb4b1bd1ebe8218 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 02:53:21 +0000
Subject: [PATCH 552/767] Bump rack from 2.2.6.2 to 2.2.6.3

Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.6.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.6.2...v2.2.6.3)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3c5a1699..095238bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     puma (6.1.0)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.2)
+    rack (2.2.6.3)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (2.0.2)

From 2963e2d45490698c211e7843fbe82574395d85e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Mar 2023 00:59:18 +0000
Subject: [PATCH 553/767] Bump rubocop from 1.45.1 to 1.48.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.45.1 to 1.48.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.45.1...v1.48.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index d5eedeef..38bb236e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.45', require: false
+  gem 'rubocop', '~> 1.48', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c5a1699..f2d95f65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.2.0.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
     pg (1.4.5)
     puma (6.1.0)
@@ -251,19 +251,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.45.1)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
     sanitize (6.0.1)
@@ -375,7 +375,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.45)
+  rubocop (~> 1.48)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From 79f2cadd97270a074daf8f245ce48ca2120fc7ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Mar 2023 00:57:27 +0000
Subject: [PATCH 554/767] Bump pg from 1.4.5 to 1.4.6

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.5...v1.4.6)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 14984ee7..d2d6a48b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.5', group: :mysql
-gem 'pg', '~> 1.4.5', group: :postgresql
+gem 'pg', '~> 1.4.6', group: :postgresql
 
 group :development do
   gem 'spring', '~> 4'
diff --git a/Gemfile.lock b/Gemfile.lock
index ae0f863e..35fa6d02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,7 +191,7 @@ GEM
     parallel (1.22.1)
     parser (3.2.1.1)
       ast (~> 2.4.1)
-    pg (1.4.5)
+    pg (1.4.6)
     puma (6.1.0)
       nio4r (~> 2.0)
     racc (1.6.2)
@@ -367,7 +367,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.5)
-  pg (~> 1.4.5)
+  pg (~> 1.4.6)
   puma (~> 6.1)
   rack-mini-profiler
   rails (~> 6.0.0)

From b03f84893fc5e7e6c8c501eae969700ba1931de3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Mar 2023 12:19:50 +0000
Subject: [PATCH 555/767] Bump rack from 2.2.6.3 to 2.2.6.4

Bumps [rack](https://github.com/rack/rack) from 2.2.6.3 to 2.2.6.4.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.6.3...v2.2.6.4)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ae0f863e..7bf0c30a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     puma (6.1.0)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.3)
+    rack (2.2.6.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (2.0.2)

From cf4a25e6c0db40c70eafeb23f006503f70308365 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 00:56:55 +0000
Subject: [PATCH 556/767] Bump sqlite3 from 1.6.0 to 1.6.2

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.6.0 to 1.6.2.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.6.0...v1.6.2)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ae0f863e..bad99339 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -306,7 +306,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.0)
+    sqlite3 (1.6.2)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From df687a6df22c19476827f4c6790f51e2c1d768d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 06:27:50 +0000
Subject: [PATCH 557/767] Bump nokogiri from 1.14.2 to 1.14.3

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.2 to 1.14.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.14.2...v1.14.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ae0f863e..cd1613eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.14.2)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)

From deb2e9b1232e8b2c15f84e99ce2068b252fd1da5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 08:08:29 +0000
Subject: [PATCH 558/767] Bump puma from 6.1.0 to 6.2.1

Bumps [puma](https://github.com/puma/puma) from 6.1.0 to 6.2.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.1.0...v6.2.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index d2d6a48b..25292fe5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.1"
-gem 'puma', '~> 6.1'
+gem 'puma', '~> 6.2'
 gem 'rails_autolink'
 gem 'RedCloth'
 gem 'sanitize', '~> 6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index e5301f8c..1eb9725d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -184,7 +184,7 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
@@ -192,7 +192,7 @@ GEM
     parser (3.2.1.1)
       ast (~> 2.4.1)
     pg (1.4.6)
-    puma (6.1.0)
+    puma (6.2.1)
       nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.2.6.4)
@@ -368,7 +368,7 @@ DEPENDENCIES
   mocha
   mysql2 (~> 0.5.5)
   pg (~> 1.4.6)
-  puma (~> 6.1)
+  puma (~> 6.2)
   rack-mini-profiler
   rails (~> 6.0.0)
   rails-controller-testing

From 2802d7cf4e9e3e177ce8d71d34e1a1a0328a4ba2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 00:57:04 +0000
Subject: [PATCH 559/767] Bump font-awesome-sass from 6.3.0 to 6.4.0

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 25292fe5..c76f1c73 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.3.0'
+gem 'font-awesome-sass', '~> 6.4.0'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1eb9725d..2d011f52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.15.5)
-    font-awesome-sass (6.3.0)
+    font-awesome-sass (6.4.0)
       sassc (~> 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -357,7 +357,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.3.0)
+  font-awesome-sass (~> 6.4.0)
   htmlentities
   i18n-tasks (~> 1.0.12)
   jquery-rails (~> 4.5)

From 763578f165617ac1ad4a41c372c6b35b4948f6d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 00:57:27 +0000
Subject: [PATCH 560/767] Bump rack-mini-profiler from 3.0.0 to 3.1.0

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: rack-mini-profiler
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1eb9725d..c8a9e0da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,7 @@ GEM
       nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.2.6.4)
-    rack-mini-profiler (3.0.0)
+    rack-mini-profiler (3.1.0)
       rack (>= 1.2.0)
     rack-test (2.0.2)
       rack (>= 1.3)

From 3deb8ce993b9c3f9b89ffbce473c341c049b796f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 00:57:51 +0000
Subject: [PATCH 561/767] Bump yard from 0.9.28 to 0.9.34

Bumps [yard](https://github.com/lsegal/yard) from 0.9.28 to 0.9.34.
- [Release notes](https://github.com/lsegal/yard/releases)
- [Changelog](https://github.com/lsegal/yard/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lsegal/yard/compare/v0.9.28...v0.9.34)

---
updated-dependencies:
- dependency-name: yard
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1eb9725d..5e42f6d4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -331,13 +331,11 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
-    webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.1)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
     zeitwerk (2.6.7)
 
 PLATFORMS

From ae9470659b5ed3196906d57ab3be13c649e3eefe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 00:57:57 +0000
Subject: [PATCH 562/767] Bump rubocop from 1.48.1 to 1.50.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.48.1 to 1.50.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.48.1...v1.50.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index c76f1c73..d4aca44e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.48', require: false
+  gem 'rubocop', '~> 1.50', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index a503c9ef..d1da4922 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.2.1.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     pg (1.4.6)
     puma (6.2.1)
@@ -251,17 +251,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.48.1)
+    rubocop (1.50.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -373,7 +373,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.48)
+  rubocop (~> 1.50)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From d2f6ac7e1be5a9fb1de30693b59c71b7509dfafb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 00:58:19 +0000
Subject: [PATCH 563/767] Bump solargraph from 0.48.0 to 0.49.0

Bumps [solargraph](https://solargraph.org) from 0.48.0 to 0.49.0.

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a503c9ef..87c462c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.2.1.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     pg (1.4.6)
     puma (6.2.1)
@@ -242,6 +242,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rbs (2.8.4)
     ref (2.0.0)
     regexp_parser (2.7.0)
     reverse_markdown (2.1.1)
@@ -261,7 +262,7 @@ GEM
       rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -283,18 +284,19 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     smart_properties (1.17.0)
-    solargraph (0.48.0)
+    solargraph (0.49.0)
       backport (~> 1.2)
       benchmark
-      bundler (>= 1.17.2)
+      bundler (~> 2.0)
       diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
@@ -317,7 +319,7 @@ GEM
       ref
     thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.11)
+    tilt (2.1.0)
     timeout (0.3.2)
     tolk (5.0.0)
       rails (>= 6.0)

From 69fc52347fa3b1a2b52f17b440ad964409f5556b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 00:56:56 +0000
Subject: [PATCH 564/767] Bump rubocop from 1.50.1 to 1.50.2

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.50.1 to 1.50.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.50.1...v1.50.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 745ab6ec..3d3f46ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
       ffi (~> 1.0)
     rbs (2.8.4)
     ref (2.0.0)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -252,7 +252,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.50.1)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)

From 49bf58d53653fdcd1e9c8e6c5b9063d36cbb6b7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 00:57:07 +0000
Subject: [PATCH 565/767] Bump puma from 6.2.1 to 6.2.2

Bumps [puma](https://github.com/puma/puma) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.2.1...v6.2.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 745ab6ec..755b549e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
     parser (3.2.2.0)
       ast (~> 2.4.1)
     pg (1.4.6)
-    puma (6.2.1)
+    puma (6.2.2)
       nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.2.6.4)

From 87377792c31e1035d1aba0f17e7122b0a7ada997 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 00:57:23 +0000
Subject: [PATCH 566/767] Bump rspec-expectations from 3.12.2 to 3.12.3

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.12.2 to 3.12.3.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.12.2...v3.12.3)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 745ab6ec..590ea1fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -248,7 +248,7 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)

From e088e63cb90c0cb449cbeaf14504d380e2883f9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 00:59:13 +0000
Subject: [PATCH 567/767] Bump pg from 1.4.6 to 1.5.3

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.6 to 1.5.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.6...v1.5.3)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d4aca44e..ca42e93b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.5', group: :mysql
-gem 'pg', '~> 1.4.6', group: :postgresql
+gem 'pg', '~> 1.5.3', group: :postgresql
 
 group :development do
   gem 'spring', '~> 4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5cd75c9e..5cf2b61c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,7 +191,7 @@ GEM
     parallel (1.22.1)
     parser (3.2.2.0)
       ast (~> 2.4.1)
-    pg (1.4.6)
+    pg (1.5.3)
     puma (6.2.2)
       nio4r (~> 2.0)
     racc (1.6.2)
@@ -367,7 +367,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.5)
-  pg (~> 1.4.6)
+  pg (~> 1.5.3)
   puma (~> 6.2)
   rack-mini-profiler
   rails (~> 6.0.0)

From b2c40534b670168404fcad094bcdae607dfa0a65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 May 2023 00:58:12 +0000
Subject: [PATCH 568/767] Bump sqlite3 from 1.6.2 to 1.6.3

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.6.2...v1.6.3)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5cf2b61c..51032006 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -169,7 +169,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     minitest (5.17.0)
     minitest-stub-const (0.6)
     mocha (2.0.2)
@@ -308,7 +308,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.2)
+    sqlite3 (1.6.3)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 76050612ea5784f55d3a0c01c8660e531b388554 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 00:56:54 +0000
Subject: [PATCH 569/767] Bump will_paginate from 3.3.1 to 4.0.0

Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.3.1 to 4.0.0.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.3.1...v4.0.0)

---
updated-dependencies:
- dependency-name: will_paginate
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5cf2b61c..33c80347 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.1)
+    will_paginate (4.0.0)
     yard (0.9.34)
     zeitwerk (2.6.7)
 

From a385d8262686a35108e092919ae9f0b9cc02ea45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 00:57:01 +0000
Subject: [PATCH 570/767] Bump rubocop from 1.50.2 to 1.52.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.50.2 to 1.52.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.50.2...v1.52.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index ca42e93b..74dff8e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.50', require: false
+  gem 'rubocop', '~> 1.52', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5cf2b61c..a4962d1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,9 +188,10 @@ GEM
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     pg (1.5.3)
     puma (6.2.2)
       nio4r (~> 2.0)
@@ -244,7 +245,7 @@ GEM
       ffi (~> 1.0)
     rbs (2.8.4)
     ref (2.0.0)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -252,17 +253,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -375,7 +376,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.50)
+  rubocop (~> 1.52)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From a57843ec361dc17c82ff0ff516cbf88262c59817 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 00:56:46 +0000
Subject: [PATCH 571/767] Bump kt-paperclip from 7.1.1 to 7.2.0

Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip) from 7.1.1 to 7.2.0.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases)
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS)
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.1.1...v7.2.0)

---
updated-dependencies:
- dependency-name: kt-paperclip
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 74dff8e0..b6ca67f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'aasm', '~> 5.5.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.18'
 gem 'htmlentities'
-gem "kt-paperclip", "~> 7.1"
+gem "kt-paperclip", "~> 7.2"
 gem 'puma', '~> 6.2'
 gem 'rails_autolink'
 gem 'RedCloth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7910dffa..fd0c1237 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     database_cleaner (1.99.0)
     date (3.3.3)
@@ -120,7 +120,7 @@ GEM
       activesupport (>= 5.0)
     highline (2.0.3)
     htmlentities (4.3.4)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.12)
       activesupport (>= 4.0.2)
@@ -145,7 +145,7 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    kt-paperclip (7.1.1)
+    kt-paperclip (7.2.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       marcel (~> 1.0.1)
@@ -167,10 +167,10 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
     mini_portile2 (2.8.2)
-    minitest (5.17.0)
+    minitest (5.18.1)
     minitest-stub-const (0.6)
     mocha (2.0.2)
       ruby2_keywords (>= 0.0.5)
@@ -339,7 +339,7 @@ GEM
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
     yard (0.9.34)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -363,7 +363,7 @@ DEPENDENCIES
   i18n-tasks (~> 1.0.12)
   jquery-rails (~> 4.5)
   jquery-ui-rails (~> 6.0.1)
-  kt-paperclip (~> 7.1)
+  kt-paperclip (~> 7.2)
   listen
   minitest-stub-const
   mocha

From 3d21e2a415ad716503d4f4dc4fe5113fb10c8072 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 00:56:59 +0000
Subject: [PATCH 572/767] Bump tolk from 5.0.0 to 5.0.1

Bumps [tolk](https://github.com/tolk/tolk) from 5.0.0 to 5.0.1.
- [Changelog](https://github.com/tolk/tolk/blob/v5.0.1/CHANGELOG.md)
- [Commits](https://github.com/tolk/tolk/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: tolk
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 74dff8e0..6e69e0bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@ group :development do
   gem 'spring', '~> 4'
   gem 'yard'
 
-  gem 'tolk', '~> 5.0.0'
+  gem 'tolk', '~> 5.0.1'
 
   gem 'bullet'
   gem 'rack-mini-profiler'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7910dffa..7af2cdcf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     database_cleaner (1.99.0)
     date (3.3.3)
@@ -120,7 +120,7 @@ GEM
       activesupport (>= 5.0)
     highline (2.0.3)
     htmlentities (4.3.4)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.12)
       activesupport (>= 4.0.2)
@@ -155,9 +155,9 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -170,12 +170,12 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.2)
-    minitest (5.17.0)
+    minitest (5.18.1)
     minitest-stub-const (0.6)
     mocha (2.0.2)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -185,8 +185,8 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.23.0)
     parser (3.2.2.3)
@@ -195,11 +195,11 @@ GEM
     pg (1.5.3)
     puma (6.2.2)
       nio4r (~> 2.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.1)
+    rack (2.2.7)
     rack-mini-profiler (3.1.0)
       rack (>= 1.2.0)
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (6.0.5.1)
       actioncable (= 6.0.5.1)
@@ -223,8 +223,9 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
@@ -318,11 +319,11 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.2.1)
+    thor (1.2.2)
     thread_safe (0.3.6)
     tilt (2.1.0)
     timeout (0.3.2)
-    tolk (5.0.0)
+    tolk (5.0.1)
       rails (>= 6.0)
       safe_yaml (>= 0.8.6)
       sprockets-rails (~> 3.4)
@@ -339,7 +340,7 @@ GEM
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
     yard (0.9.34)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -384,7 +385,7 @@ DEPENDENCIES
   spring (~> 4)
   sqlite3
   therubyracer
-  tolk (~> 5.0.0)
+  tolk (~> 5.0.1)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)
   will_paginate

From 1cc50d071b68ed12338fe10b176f674a0a441680 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 00:57:10 +0000
Subject: [PATCH 573/767] Bump bcrypt from 3.1.18 to 3.1.19

Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.18 to 3.1.19.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.18...v3.1.19)

---
updated-dependencies:
- dependency-name: bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 74dff8e0..84cdc891 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'uglifier', '>=1.3.0'
 
 gem 'aasm', '~> 5.5.0'
 gem 'acts_as_list'
-gem 'bcrypt', '~> 3.1.18'
+gem 'bcrypt', '~> 3.1.19'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.1"
 gem 'puma', '~> 6.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7910dffa..8fd42f3e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     backport (1.2.0)
-    bcrypt (3.1.18)
+    bcrypt (3.1.19)
     benchmark (0.2.1)
     better_html (2.0.1)
       actionview (>= 6.0)
@@ -350,7 +350,7 @@ DEPENDENCIES
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
-  bcrypt (~> 3.1.18)
+  bcrypt (~> 3.1.19)
   bootstrap-sass (= 3.4.1)
   bullet
   byebug

From a55d4500a0edd4e15f3b2820cc8b084b5f69a055 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 00:58:49 +0000
Subject: [PATCH 574/767] Bump puma from 6.2.2 to 6.3.0

Bumps [puma](https://github.com/puma/puma) from 6.2.2 to 6.3.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.2.2...v6.3.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c3d465e..9b7e7d3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.19'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.2"
-gem 'puma', '~> 6.2'
+gem 'puma', '~> 6.3'
 gem 'rails_autolink'
 gem 'RedCloth'
 gem 'sanitize', '~> 6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index faa7c6a5..c8fb3b02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,7 +193,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.3)
-    puma (6.2.2)
+    puma (6.3.0)
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.7)
@@ -370,7 +370,7 @@ DEPENDENCIES
   mocha
   mysql2 (~> 0.5.5)
   pg (~> 1.5.3)
-  puma (~> 6.2)
+  puma (~> 6.3)
   rack-mini-profiler
   rails (~> 6.0.0)
   rails-controller-testing

From 0164195ae9575c998f047642316a1b75b434165e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 01:01:00 +0000
Subject: [PATCH 575/767] Bump mocha from 2.0.2 to 2.0.4

Bumps [mocha](https://github.com/freerange/mocha) from 2.0.2 to 2.0.4.
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v2.0.2...v2.0.4)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index faa7c6a5..795e75ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
     mini_portile2 (2.8.2)
     minitest (5.18.1)
     minitest-stub-const (0.6)
-    mocha (2.0.2)
+    mocha (2.0.4)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)
     net-imap (0.3.6)

From 11895a160a710850c8d8d3cc6301c422d2484c4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 00:51:11 +0000
Subject: [PATCH 576/767] Bump rubocop from 1.52.1 to 1.54.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.52.1 to 1.54.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.52.1...v1.54.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c3d465e..353afb37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.52', require: false
+  gem 'rubocop', '~> 1.54', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index faa7c6a5..910a718d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -151,6 +151,7 @@ GEM
       marcel (~> 1.0.1)
       mime-types
       terrapin (~> 0.6.0)
+    language_server-protocol (3.17.0.3)
     libv8 (3.16.14.19)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -254,8 +255,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.52.1)
+    rubocop (1.54.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
@@ -377,7 +379,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.52)
+  rubocop (~> 1.54)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From f295bfd0236666e588010fe10279455a2ed27086 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 00:21:12 +0000
Subject: [PATCH 577/767] Bump jquery-rails from 4.5.1 to 4.6.0

Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.5.1 to 4.6.0.
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v4.5.1...v4.6.0)

---
updated-dependencies:
- dependency-name: jquery-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 03562295..dc262699 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gem 'activemodel-serializers-xml', '~> 1.0.1'
 
 gem 'coffee-rails', '~> 5.0.0'
 
-gem 'jquery-rails', '~> 4.5'
+gem 'jquery-rails', '~> 4.6'
 gem 'jquery-ui-rails', '~>6.0.1'
 
 gem 'rails', '~> 6.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f5fbbe3..04bb44f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,7 +134,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     jaro_winkler (1.5.4)
-    jquery-rails (4.5.1)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -364,7 +364,7 @@ DEPENDENCIES
   font-awesome-sass (~> 6.4.0)
   htmlentities
   i18n-tasks (~> 1.0.12)
-  jquery-rails (~> 4.5)
+  jquery-rails (~> 4.6)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.2)
   listen

From 97a5f622f101241d5a06b00a0a67fa7f779c2706 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 00:21:45 +0000
Subject: [PATCH 578/767] Bump rails-dom-testing from 2.0.3 to 2.1.1

Bumps [rails-dom-testing](https://github.com/rails/rails-dom-testing) from 2.0.3 to 2.1.1.
- [Release notes](https://github.com/rails/rails-dom-testing/releases)
- [Commits](https://github.com/rails/rails-dom-testing/compare/v2.0.3...v2.1.1)

---
updated-dependencies:
- dependency-name: rails-dom-testing
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 03562295..15bbbc94 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@ group :test do
   gem 'minitest-stub-const'
   gem 'mocha', :require => false
   gem 'rails-controller-testing'
-  gem 'rails-dom-testing', '~> 2.0.0'
+  gem 'rails-dom-testing', '~> 2.1.1'
   gem 'rspec-expectations'
   gem 'simplecov'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f5fbbe3..56ddc3da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -221,8 +221,9 @@ GEM
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
@@ -376,7 +377,7 @@ DEPENDENCIES
   rack-mini-profiler
   rails (~> 6.0.0)
   rails-controller-testing
-  rails-dom-testing (~> 2.0.0)
+  rails-dom-testing (~> 2.1.1)
   rails_autolink
   rspec-expectations
   rubocop (~> 1.54)

From 13603eff685d1988e5934a5c4f3911dce1ba71dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 20:05:13 +0000
Subject: [PATCH 579/767] Bump sanitize from 6.0.1 to 6.0.2

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6f5fbbe3..4c874be0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,7 +186,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.2)
+    nokogiri (1.15.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -271,7 +271,7 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sanitize (6.0.1)
+    sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)

From 2ca6b731f0f068f079696ee84030d27c7f3dfad9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:43:42 +0000
Subject: [PATCH 580/767] Bump rubocop from 1.54.0 to 1.54.2

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.54.0 to 1.54.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.54.0...v1.54.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6f5fbbe3..7cc254dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -255,7 +255,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.54.0)
+    rubocop (1.54.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 6d92f273a6204c5e2e59b27dbced73afa7ace0af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 00:57:53 +0000
Subject: [PATCH 581/767] Bump mocha from 2.0.4 to 2.1.0

Bumps [mocha](https://github.com/freerange/mocha) from 2.0.4 to 2.1.0.
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v2.0.4...v2.1.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 950a995e..ef7296e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     mini_portile2 (2.8.2)
     minitest (5.18.1)
     minitest-stub-const (0.6)
-    mocha (2.0.4)
+    mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)
     net-imap (0.3.6)

From beaf5b9064998d2b4e2d021176fb954cb2335cf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 00:34:16 +0000
Subject: [PATCH 582/767] Bump rack-mini-profiler from 3.1.0 to 3.1.1

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: rack-mini-profiler
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 950a995e..3d5171ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,8 +197,8 @@ GEM
     puma (6.3.0)
       nio4r (~> 2.0)
     racc (1.7.1)
-    rack (2.2.7)
-    rack-mini-profiler (3.1.0)
+    rack (2.2.8)
+    rack-mini-profiler (3.1.1)
       rack (>= 1.2.0)
     rack-test (2.1.0)
       rack (>= 1.3)

From 5537de25efbc637481655af3fb1b1bcad43966b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Aug 2023 22:15:35 +0000
Subject: [PATCH 583/767] Bump puma from 6.3.0 to 6.3.1

Bumps [puma](https://github.com/puma/puma) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 950a995e..772042d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -194,7 +194,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.3)
-    puma (6.3.0)
+    puma (6.3.1)
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.7)

From 706832cc78d2a9ffac4ad5abacfceb0d52b4fd06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Oct 2023 00:07:59 +0000
Subject: [PATCH 584/767] Bump rubocop from 1.54.2 to 1.57.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.54.2 to 1.57.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.54.2...v1.57.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 424c655d..7a8a3d71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.54', require: false
+  gem 'rubocop', '~> 1.57', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 772042d2..43ddc34e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,6 +72,7 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     backport (1.2.0)
+    base64 (0.1.1)
     bcrypt (3.1.19)
     benchmark (0.2.1)
     better_html (2.0.1)
@@ -190,7 +191,7 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pg (1.5.3)
@@ -248,23 +249,24 @@ GEM
       ffi (~> 1.0)
     rbs (2.8.4)
     ref (2.0.0)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.54.2)
+    rubocop (1.57.0)
+      base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
@@ -336,7 +338,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -380,7 +382,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.1.1)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.54)
+  rubocop (~> 1.57)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.2)
   simplecov

From c278640525d5c4fd618be9f9ea849b8417cb207e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 00:39:32 +0000
Subject: [PATCH 585/767] Bump i18n-tasks from 1.0.12 to 1.0.13

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.12 to 1.0.13.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.12...v1.0.13)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7a8a3d71..a3b7e63e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 1.0.12'
+  gem 'i18n-tasks', '~> 1.0.13'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 87e79ac7..bde7cd0e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,7 +75,7 @@ GEM
     base64 (0.1.1)
     bcrypt (3.1.19)
     benchmark (0.2.1)
-    better_html (2.0.1)
+    better_html (2.0.2)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
@@ -119,18 +119,18 @@ GEM
       sassc (~> 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
-    highline (2.0.3)
+    highline (2.1.0)
     htmlentities (4.3.4)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.12)
+    i18n-tasks (1.0.13)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
-      parser (>= 2.2.3.0)
+      parser (>= 3.2.2.1)
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
@@ -157,7 +157,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -171,8 +171,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.1)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
@@ -187,7 +187,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.3)
+    nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -229,7 +229,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.5)
+    rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.8)
@@ -345,7 +345,7 @@ GEM
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
     yard (0.9.34)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
@@ -366,7 +366,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 6.4.0)
   htmlentities
-  i18n-tasks (~> 1.0.12)
+  i18n-tasks (~> 1.0.13)
   jquery-rails (~> 4.6)
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.2)

From e66e782a96858709b8b03b571a4970cb68408788 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 17:23:26 +0000
Subject: [PATCH 586/767] Bump bullet from 7.0.7 to 7.1.2

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.7 to 7.1.2.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.7...7.1.2)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bde7cd0e..7864b2a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.0.7)
+    bullet (7.1.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)

From 282510a7e78671312180d918a91585f2a201955e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Oct 2023 00:21:34 +0000
Subject: [PATCH 587/767] Bump pg from 1.5.3 to 1.5.4

Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.3 to 1.5.4.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.3...v1.5.4)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a3b7e63e..2fc6a1a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'therubyracer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.5', group: :mysql
-gem 'pg', '~> 1.5.3', group: :postgresql
+gem 'pg', '~> 1.5.4', group: :postgresql
 
 group :development do
   gem 'spring', '~> 4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7864b2a8..9367b57b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -194,7 +194,7 @@ GEM
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    pg (1.5.3)
+    pg (1.5.4)
     puma (6.3.1)
       nio4r (~> 2.0)
     racc (1.7.1)
@@ -374,7 +374,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.5)
-  pg (~> 1.5.3)
+  pg (~> 1.5.4)
   puma (~> 6.3)
   rack-mini-profiler
   rails (~> 6.0.0)

From 92c0fd2c7c58ab06fc5d4a9471912f0133436cb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Oct 2023 00:21:44 +0000
Subject: [PATCH 588/767] Bump font-awesome-sass from 6.4.0 to 6.4.2

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.4.0 to 6.4.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index a3b7e63e..8a91a75f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.4.0'
+gem 'font-awesome-sass', '~> 6.4.2'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7864b2a8..4406955a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,8 +114,8 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.15.5)
-    font-awesome-sass (6.4.0)
+    ffi (1.16.3)
+    font-awesome-sass (6.4.2)
       sassc (~> 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -364,7 +364,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.4.0)
+  font-awesome-sass (~> 6.4.2)
   htmlentities
   i18n-tasks (~> 1.0.13)
   jquery-rails (~> 4.6)

From 77af1b4148ebaef364744f5565330587ad7229d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Oct 2023 00:37:43 +0000
Subject: [PATCH 589/767] Bump rails-dom-testing from 2.1.1 to 2.2.0

Bumps [rails-dom-testing](https://github.com/rails/rails-dom-testing) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/rails/rails-dom-testing/releases)
- [Commits](https://github.com/rails/rails-dom-testing/compare/v2.1.1...v2.2.0)

---
updated-dependencies:
- dependency-name: rails-dom-testing
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c763ae17..c553b0c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@ group :test do
   gem 'minitest-stub-const'
   gem 'mocha', :require => false
   gem 'rails-controller-testing'
-  gem 'rails-dom-testing', '~> 2.1.1'
+  gem 'rails-dom-testing', '~> 2.2.0'
   gem 'rspec-expectations'
   gem 'simplecov'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 928436a0..87db5fed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,7 +222,7 @@ GEM
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -379,7 +379,7 @@ DEPENDENCIES
   rack-mini-profiler
   rails (~> 6.0.0)
   rails-controller-testing
-  rails-dom-testing (~> 2.1.1)
+  rails-dom-testing (~> 2.2.0)
   rails_autolink
   rspec-expectations
   rubocop (~> 1.57)

From 33ac82c2625769b97d4d030269a50bef82f55549 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Oct 2023 00:38:31 +0000
Subject: [PATCH 590/767] Bump sanitize from 6.0.2 to 6.1.0

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.2...v6.1.0)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c763ae17..bc09a76e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem "kt-paperclip", "~> 7.2"
 gem 'puma', '~> 6.3'
 gem 'rails_autolink'
 gem 'RedCloth'
-gem 'sanitize', '~> 6.0'
+gem 'sanitize', '~> 6.1'
 gem 'tracks-chartjs-ror'
 gem 'will_paginate'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 928436a0..c5429d65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sanitize (6.0.2)
+    sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)
@@ -383,7 +383,7 @@ DEPENDENCIES
   rails_autolink
   rspec-expectations
   rubocop (~> 1.57)
-  sanitize (~> 6.0)
+  sanitize (~> 6.1)
   sassc-rails (~> 2.1.2)
   simplecov
   solargraph

From f5000acb430f8dafe3e1b27a436f446b67bd6df1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 00:01:31 +0000
Subject: [PATCH 591/767] Bump rubocop from 1.57.0 to 1.57.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.57.0 to 1.57.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.57.0...v1.57.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 64a5624e..9e323c17 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -257,7 +257,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.57.0)
+    rubocop (1.57.1)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

From 31b46825deb02a426f72d2a6400aecdc648d8006 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 00:01:54 +0000
Subject: [PATCH 592/767] Bump puma from 6.3.1 to 6.4.0

Bumps [puma](https://github.com/puma/puma) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.1...v6.4.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b084f541..5c6e0722 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.19'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.2"
-gem 'puma', '~> 6.3'
+gem 'puma', '~> 6.4'
 gem 'rails_autolink'
 gem 'RedCloth'
 gem 'sanitize', '~> 6.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 64a5624e..1fe710c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
-    puma (6.3.1)
+    puma (6.4.0)
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.8)
@@ -375,7 +375,7 @@ DEPENDENCIES
   mocha
   mysql2 (~> 0.5.5)
   pg (~> 1.5.4)
-  puma (~> 6.3)
+  puma (~> 6.4)
   rack-mini-profiler
   rails (~> 6.0.0)
   rails-controller-testing

From 12afa11429cde6ff5785fcb14cb6c875b0afa66d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Oct 2023 00:57:24 +0000
Subject: [PATCH 593/767] Bump sqlite3 from 1.6.3 to 1.6.7

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.6.3 to 1.6.7.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.6.3...v1.6.7)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2c5c3668..ebe6e5d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -315,7 +315,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.3)
+    sqlite3 (1.6.7)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From c8ddc60f0c4feda5237bdaa506d662275e0af89f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Oct 2023 00:17:06 +0000
Subject: [PATCH 594/767] Bump rubocop from 1.57.1 to 1.57.2

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.57.1 to 1.57.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.57.1...v1.57.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ebe6e5d7..003fd3c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,6 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     backport (1.2.0)
-    base64 (0.1.1)
     bcrypt (3.1.19)
     benchmark (0.2.1)
     better_html (2.0.2)
@@ -257,8 +256,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.57.1)
-      base64 (~> 0.1.1)
+    rubocop (1.57.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -269,7 +267,7 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)

From e454fc21ceddce0e260322261429da870b592e87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 00:48:25 +0000
Subject: [PATCH 595/767] Bump sqlite3 from 1.6.7 to 1.6.8

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.6.7 to 1.6.8.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.6.7...v1.6.8)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ebe6e5d7..1216205c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -171,7 +171,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     minitest-stub-const (0.6)
     mocha (2.1.0)
@@ -315,7 +315,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.7)
+    sqlite3 (1.6.8)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 6f8bf1db4ef8b126f9013e99fa958ed7558f3bf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Nov 2023 00:54:31 +0000
Subject: [PATCH 596/767] Bump RedCloth from 4.3.2 to 4.3.3

Bumps [RedCloth](https://github.com/jgarber/redcloth) from 4.3.2 to 4.3.3.
- [Changelog](https://github.com/jgarber/redcloth/blob/master/CHANGELOG)
- [Commits](https://github.com/jgarber/redcloth/compare/v4.3.2...v4.3.3)

---
updated-dependencies:
- dependency-name: RedCloth
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8957340f..8d2785e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.3.2)
+    RedCloth (4.3.3)
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.5.1)

From d64e3fb96dba0f90b94c4a7d9d623e7cd69e4151 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Nov 2023 00:54:58 +0000
Subject: [PATCH 597/767] Bump bcrypt from 3.1.19 to 3.1.20

Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.19 to 3.1.20.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.19...v3.1.20)

---
updated-dependencies:
- dependency-name: bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5c6e0722..83e1e892 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'uglifier', '>=1.3.0'
 
 gem 'aasm', '~> 5.5.0'
 gem 'acts_as_list'
-gem 'bcrypt', '~> 3.1.19'
+gem 'bcrypt', '~> 3.1.20'
 gem 'htmlentities'
 gem "kt-paperclip", "~> 7.2"
 gem 'puma', '~> 6.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8957340f..7e137b46 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     backport (1.2.0)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
     benchmark (0.2.1)
     better_html (2.0.2)
       actionview (>= 6.0)
@@ -354,7 +354,7 @@ DEPENDENCIES
   actionpack-xml_parser (~> 2.0)
   activemodel-serializers-xml (~> 1.0.1)
   acts_as_list
-  bcrypt (~> 3.1.19)
+  bcrypt (~> 3.1.20)
   bootstrap-sass (= 3.4.1)
   bullet
   byebug

From b6797bf67c54b2bf3660100d58e10faecea1c711 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Nov 2023 00:17:54 +0000
Subject: [PATCH 598/767] Bump spring from 4.1.1 to 4.1.3

Bumps [spring](https://github.com/rails/spring) from 4.1.1 to 4.1.3.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v4.1.1...v4.1.3)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4c7ef58c..4cb93061 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -305,7 +305,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    spring (4.1.1)
+    spring (4.1.3)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)

From a8ca55389b853e8c290d9a8c5d95f6dbe14b5b65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Nov 2023 00:46:51 +0000
Subject: [PATCH 599/767] Bump factory_bot_rails from 6.2.0 to 6.4.2

Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.2.0 to 6.4.2.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/main/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.2.0...v6.4.2)

---
updated-dependencies:
- dependency-name: factory_bot_rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4c7ef58c..3e0cb911 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,10 +108,10 @@ GEM
     e2mmap (0.1.0)
     erubi (1.12.0)
     execjs (2.8.1)
-    factory_bot (6.2.1)
+    factory_bot (6.4.2)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
+    factory_bot_rails (6.4.2)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.16.3)
     font-awesome-sass (6.4.2)
@@ -156,7 +156,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -186,7 +186,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -196,7 +196,7 @@ GEM
     pg (1.5.4)
     puma (6.4.0)
       nio4r (~> 2.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rack-mini-profiler (3.1.1)
       rack (>= 1.2.0)
@@ -242,7 +242,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -322,7 +322,7 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.2.2)
+    thor (1.3.0)
     thread_safe (0.3.6)
     tilt (2.1.0)
     timeout (0.3.2)

From 7ec8279178a930ed0e0f037bf67be36bcefbd604 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 00:56:08 +0000
Subject: [PATCH 600/767] Bump bullet from 7.1.2 to 7.1.4

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.2 to 7.1.4.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.2...7.1.4)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 670bd9c1..6fb9e693 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (7.1.2)
+    bullet (7.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)

From e01d52756ccd63341745ea813e04e1bb4cb75361 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 00:56:32 +0000
Subject: [PATCH 601/767] Bump sqlite3 from 1.6.8 to 1.6.9

Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.6.8 to 1.6.9.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.6.8...v1.6.9)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 670bd9c1..e18df164 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -313,7 +313,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.8)
+    sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 4b8dbe4a8c236f737a4fad8d0c924cdba4d6f69c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 00:18:23 +0000
Subject: [PATCH 602/767] Bump font-awesome-sass from 6.4.2 to 6.5.0

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.4.2 to 6.5.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 83e1e892..77649b81 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.4.2'
+gem 'font-awesome-sass', '~> 6.5.0'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a761298..a2e2921f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.16.3)
-    font-awesome-sass (6.4.2)
+    font-awesome-sass (6.5.0)
       sassc (~> 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -362,7 +362,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.4.2)
+  font-awesome-sass (~> 6.5.0)
   htmlentities
   i18n-tasks (~> 1.0.13)
   jquery-rails (~> 4.6)

From 1b1e3c53227318963869ba04363b411ba63fda86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Dec 2023 00:06:57 +0000
Subject: [PATCH 603/767] Bump font-awesome-sass from 6.5.0 to 6.5.1

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.5.0 to 6.5.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 77649b81..f9df1724 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.0.0'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.5.0'
+gem 'font-awesome-sass', '~> 6.5.1'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a2e2921f..4d09727e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.16.3)
-    font-awesome-sass (6.5.0)
+    font-awesome-sass (6.5.1)
       sassc (~> 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -362,7 +362,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.5.0)
+  font-awesome-sass (~> 6.5.1)
   htmlentities
   i18n-tasks (~> 1.0.13)
   jquery-rails (~> 4.6)

From 3d45c7dbae11d57de619ff3795a4f4210a9c6ed0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 00:01:15 +0000
Subject: [PATCH 604/767] Bump rubocop from 1.57.2 to 1.58.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.57.2 to 1.58.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.57.2...v1.58.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 77649b81..2e010d84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.57', require: false
+  gem 'rubocop', '~> 1.58', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index a2e2921f..c6968cea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -140,7 +140,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.6.3)
+    json (2.7.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -256,7 +256,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.57.2)
+    rubocop (1.58.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -264,7 +264,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -380,7 +380,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.2.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.57)
+  rubocop (~> 1.58)
   sanitize (~> 6.1)
   sassc-rails (~> 2.1.2)
   simplecov

From 010eb00f8ec6e26decda7730fd1b1583ce385a6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:06:52 +0000
Subject: [PATCH 605/767] Bump solargraph from 0.49.0 to 0.50.0

Bumps [solargraph](https://github.com/castwide/solargraph) from 0.49.0 to 0.50.0.
- [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md)
- [Commits](https://github.com/castwide/solargraph/compare/v0.49.0...v0.50.0)

---
updated-dependencies:
- dependency-name: solargraph
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c6968cea..64d2373b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,7 +73,7 @@ GEM
       execjs (~> 2)
     backport (1.2.0)
     bcrypt (3.1.20)
-    benchmark (0.2.1)
+    benchmark (0.3.0)
     better_html (2.0.2)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -133,14 +133,14 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.6)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.7.0)
+    json (2.7.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -248,7 +248,7 @@ GEM
       ffi (~> 1.0)
     rbs (2.8.4)
     ref (2.0.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.8.3)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.6)
@@ -289,7 +289,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     smart_properties (1.17.0)
-    solargraph (0.49.0)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
@@ -324,7 +324,7 @@ GEM
       ref
     thor (1.3.0)
     thread_safe (0.3.6)
-    tilt (2.1.0)
+    tilt (2.3.0)
     timeout (0.3.2)
     tolk (5.0.1)
       rails (>= 6.0)

From f405861c60f6b8519ac5eac67eac207c4da7a8e3 Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Thu, 15 Feb 2024 09:37:38 -0600
Subject: [PATCH 606/767] ci: Ruby 2.7 needs an older version of bundler

Pin Bundler to 2.4.22 so that 2.7 CI keeps working.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b770a113..bca1e0be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /app
 RUN touch /etc/app-env
 
 COPY Gemfile* /app/
-RUN gem install bundler
+RUN gem install bundler -v 2.4.22
 RUN bundle install --jobs 4
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -

From 6ead4c0307701eccd3ccd0dcb92f3f71c3cde091 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 00:11:24 +0300
Subject: [PATCH 607/767] Fix tests by removing Ruby 2.7 testing, which is
 already EOL

---
 .github/workflows/continuous-integration.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index f66ed13c..f734c0af 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -6,13 +6,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.7", "3.0"]
+        ruby: ["3.0"]
         db: [sqlite, mysql, postgres]
-        exclude:
-          - ruby: "2.6"
-            db: sqlite
-          - ruby: "2.6"
-            db: postgres
 
     steps:
       - uses: actions/checkout@v1

From 7584d4f051c6fb79f1357ac0ba77cf0f7b49b513 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 00:28:49 +0300
Subject: [PATCH 608/767] Upgrade Ruby version to hopefully fix Dependabot

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 95e3ba81..9f55b2cc 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5
+3.0

From f76a00f2618a4004347c64b7e5216b9af9bb2cc5 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 00:31:07 +0300
Subject: [PATCH 609/767] Rubocop still doesn't support Ruby > 2.5, so let's
 disable that.

---
 .codeclimate.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 916b43f3..58a5fd47 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -21,14 +21,5 @@ plugins:
     enabled: true
   reek:
     enabled: true
-  rubocop:
-    enabled: true
-    checks:
-      Rubocop/Style/StringLiterals:
-        enabled: false
-      Rubocop/Style/TrailingCommaInLiteral:
-        enabled: false
-      Rubocop/Style/HashSyntax:
-        enabled: false
 #exclude_patterns:
 #- app/assets/javascripts-jquery-ui

From 03bc9a4dda18d9467404a8006dec23105bd9861b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:41:43 +0000
Subject: [PATCH 610/767] Bump rack-mini-profiler from 3.1.1 to 3.3.1

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 3.1.1 to 3.3.1.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v3.1.1...v3.3.1)

---
updated-dependencies:
- dependency-name: rack-mini-profiler
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b81a50c0..9762df67 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,8 +197,8 @@ GEM
     puma (6.4.0)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (2.2.8)
-    rack-mini-profiler (3.1.1)
+    rack (2.2.9)
+    rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)
     rack-test (2.1.0)
       rack (>= 1.3)

From 97da4df7cb37b80cf73f8fd51f03315487c81f61 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:46:19 +0000
Subject: [PATCH 611/767] Bump puma from 6.4.0 to 6.4.2

Bumps [puma](https://github.com/puma/puma) from 6.4.0 to 6.4.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.4.0...v6.4.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b81a50c0..ec6c016a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.9)
+    nio4r (2.7.3)
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -194,7 +194,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
-    puma (6.4.0)
+    puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
     rack (2.2.8)

From 9fe75adca3394b290759964d587f902a18603365 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:56:58 +0000
Subject: [PATCH 612/767] Bump yard from 0.9.34 to 0.9.36

Bumps [yard](https://github.com/lsegal/yard) from 0.9.34 to 0.9.36.
- [Release notes](https://github.com/lsegal/yard/releases)
- [Changelog](https://github.com/lsegal/yard/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lsegal/yard/compare/v0.9.34...v0.9.36)

---
updated-dependencies:
- dependency-name: yard
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68c59467..6dd0c16e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -342,7 +342,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
-    yard (0.9.34)
+    yard (0.9.36)
     zeitwerk (2.6.12)
 
 PLATFORMS

From 444fa0dfff893dadbfc36eae7dbad5bf7f3cf37b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 22:00:45 +0000
Subject: [PATCH 613/767] Bump rexml from 3.2.6 to 3.2.8

Bumps [rexml](https://github.com/ruby/rexml) from 3.2.6 to 3.2.8.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.2.6...v3.2.8)

---
updated-dependencies:
- dependency-name: rexml
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68c59467..d3d446e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -251,7 +251,8 @@ GEM
     regexp_parser (2.8.3)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
@@ -315,6 +316,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)

From 2f32ba5595122ac843aedb1c6ea5c4a8a537113f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 22:10:43 +0000
Subject: [PATCH 614/767] Bump activerecord from 6.0.5.1 to 6.0.6.1

Bumps [activerecord](https://github.com/rails/rails) from 6.0.5.1 to 6.0.6.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.1.3.4/activerecord/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v6.0.5.1...v6.0.6.1)

---
updated-dependencies:
- dependency-name: activerecord
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 108 +++++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2e8773a1..70958586 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,26 +4,26 @@ GEM
     RedCloth (4.3.3)
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.0.5.1)
-      actionpack (= 6.0.5.1)
+    actioncable (6.0.6.1)
+      actionpack (= 6.0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.5.1)
-      actionpack (= 6.0.5.1)
-      activejob (= 6.0.5.1)
-      activerecord (= 6.0.5.1)
-      activestorage (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    actionmailbox (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.5.1)
-      actionpack (= 6.0.5.1)
-      actionview (= 6.0.5.1)
-      activejob (= 6.0.5.1)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.5.1)
-      actionview (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    actionpack (6.0.6.1)
+      actionview (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
@@ -31,36 +31,36 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.0.5.1)
-      actionpack (= 6.0.5.1)
-      activerecord (= 6.0.5.1)
-      activestorage (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    actiontext (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.5.1)
-      activesupport (= 6.0.5.1)
+    actionview (6.0.6.1)
+      activesupport (= 6.0.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.5.1)
-      activesupport (= 6.0.5.1)
+    activejob (6.0.6.1)
+      activesupport (= 6.0.6.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.5.1)
-      activesupport (= 6.0.5.1)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.5.1)
-      activemodel (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
-    activestorage (6.0.5.1)
-      actionpack (= 6.0.5.1)
-      activejob (= 6.0.5.1)
-      activerecord (= 6.0.5.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activestorage (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
       marcel (~> 1.0)
-    activesupport (6.0.5.1)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -99,7 +99,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.1)
     crass (1.0.6)
     database_cleaner (1.99.0)
     date (3.3.3)
@@ -120,7 +120,7 @@ GEM
       activesupport (>= 5.0)
     highline (2.1.0)
     htmlentities (4.3.4)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.13)
       activesupport (>= 4.0.2)
@@ -171,7 +171,7 @@ GEM
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.23.1)
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
@@ -202,20 +202,20 @@ GEM
       rack (>= 1.2.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.5.1)
-      actioncable (= 6.0.5.1)
-      actionmailbox (= 6.0.5.1)
-      actionmailer (= 6.0.5.1)
-      actionpack (= 6.0.5.1)
-      actiontext (= 6.0.5.1)
-      actionview (= 6.0.5.1)
-      activejob (= 6.0.5.1)
-      activemodel (= 6.0.5.1)
-      activerecord (= 6.0.5.1)
-      activestorage (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    rails (6.0.6.1)
+      actioncable (= 6.0.6.1)
+      actionmailbox (= 6.0.6.1)
+      actionmailer (= 6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actiontext (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.5.1)
+      railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -235,9 +235,9 @@ GEM
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (6.0.5.1)
-      actionpack (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    railties (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -345,7 +345,7 @@ GEM
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
     yard (0.9.36)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby

From 7f567862d74e10ce1a3bc48b2e45fb4313a2b0bb Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 01:43:38 +0300
Subject: [PATCH 615/767] Upgrade Rails to 6.1

---
 Gemfile      |   2 +-
 Gemfile.lock | 152 ++++++++++++++++++++++++++-------------------------
 2 files changed, 79 insertions(+), 75 deletions(-)

diff --git a/Gemfile b/Gemfile
index cb2ca3e6..ca474828 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'coffee-rails', '~> 5.0.0'
 gem 'jquery-rails', '~> 4.6'
 gem 'jquery-ui-rails', '~>6.0.1'
 
-gem 'rails', '~> 6.0.0'
+gem 'rails', '~> 6.1'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 70958586..f01f1abf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,70 +4,75 @@ GEM
     RedCloth (4.3.3)
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.0.6.1)
-      actionpack (= 6.0.6.1)
+    actioncable (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionmailbox (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (>= 2.7.1)
-    actionmailer (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
+    actionmailer (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6.1)
-      actionview (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7.8)
+      actionview (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actiontext (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionview (6.1.7.8)
+      activesupport (= 6.1.7.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    activejob (6.1.7.8)
+      activesupport (= 6.1.7.8)
       globalid (>= 0.3.6)
-    activemodel (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    activemodel (6.1.7.8)
+      activesupport (= 6.1.7.8)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activestorage (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
+    activerecord (6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+    activestorage (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       marcel (~> 1.0)
-    activesupport (6.0.6.1)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    acts_as_list (1.1.0)
-      activerecord (>= 4.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    acts_as_list (1.2.1)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
     ast (2.4.2)
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
@@ -102,7 +107,7 @@ GEM
     concurrent-ruby (1.3.1)
     crass (1.0.6)
     database_cleaner (1.99.0)
-    date (3.3.3)
+    date (3.3.4)
     diff-lcs (1.5.0)
     docile (1.1.5)
     e2mmap (0.1.0)
@@ -116,8 +121,8 @@ GEM
     ffi (1.16.3)
     font-awesome-sass (6.5.1)
       sassc (~> 2.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     highline (2.1.0)
     htmlentities (4.3.4)
     i18n (1.14.5)
@@ -169,21 +174,21 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.23.1)
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)
-    net-imap (0.3.6)
+    net-imap (0.4.12)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
     nokogiri (1.15.5)
@@ -202,20 +207,20 @@ GEM
       rack (>= 1.2.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.6.1)
-      actioncable (= 6.0.6.1)
-      actionmailbox (= 6.0.6.1)
-      actionmailer (= 6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actiontext (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6.1)
+    rails (6.1.7.8)
+      actioncable (= 6.1.7.8)
+      actionmailbox (= 6.1.7.8)
+      actionmailer (= 6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actiontext (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7.8)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -235,12 +240,12 @@ GEM
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    railties (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
@@ -325,22 +330,21 @@ GEM
       libv8 (~> 3.16.14.15)
       ref
     thor (1.3.0)
-    thread_safe (0.3.6)
     tilt (2.3.0)
-    timeout (0.3.2)
+    timeout (0.4.1)
     tolk (5.0.1)
       rails (>= 6.0)
       safe_yaml (>= 0.8.6)
       sprockets-rails (~> 3.4)
     tracks-chartjs-ror (3.6.4)
       rails (>= 3.1)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
@@ -377,7 +381,7 @@ DEPENDENCIES
   pg (~> 1.5.4)
   puma (~> 6.4)
   rack-mini-profiler
-  rails (~> 6.0.0)
+  rails (~> 6.1)
   rails-controller-testing
   rails-dom-testing (~> 2.2.0)
   rails_autolink
@@ -397,4 +401,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.33
+   2.4.19

From 86e36b07a65838afa4c69481e9a4479af35e9bde Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 4 Jan 2022 01:18:13 +0200
Subject: [PATCH 616/767] Fix syntax errors for upgrade of Rails version

---
 app/controllers/contexts_controller.rb                 |  2 +-
 app/controllers/projects_controller.rb                 |  2 +-
 app/controllers/todos_controller.rb                    |  6 +++---
 app/controllers/users_controller.rb                    |  2 +-
 .../recurring_todos/abstract_recurrence_pattern.rb     |  8 ++++----
 app/models/recurring_todos/daily_recurrence_pattern.rb |  2 +-
 .../recurring_todos/weekly_recurrence_pattern.rb       |  2 +-
 ..._projects_contexts_remove_not_null_from_position.rb |  8 ++++----
 test/models/todo_test.rb                               | 10 +++++-----
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb
index b1ff4c1b..c6510c40 100644
--- a/app/controllers/contexts_controller.rb
+++ b/app/controllers/contexts_controller.rb
@@ -83,7 +83,7 @@ class ContextsController < ApplicationController
       end
       format.xml do
         if @context.new_record?
-          render_failure @context.errors.to_xml.html_safe, 409
+          render_failure @context.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
         else
           head :created, :location => context_url(@context)
         end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index e116bb08..5d75d7c9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -186,7 +186,7 @@ class ProjectsController < ApplicationController
       end
       format.xml do
         if @project.new_record?
-          render_failure @project.errors.to_xml.html_safe, 409
+          render_failure @project.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
         else
           head :created, :location => project_url(@project), :text => @project.id
         end
diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 9c98c88d..1c852420 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -154,7 +154,7 @@ class TodosController < ApplicationController
           if @saved
             head :created, :location => todo_url(@todo)
           else
-            render_failure @todo.errors.to_xml.html_safe, 409
+            render_failure @todo.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
           end
         end
       end
@@ -438,7 +438,7 @@ class TodosController < ApplicationController
     rescue ActiveRecord::RecordInvalid => exception
       record = exception.record
       if record.is_a?(Dependency)
-        record.errors.each { |key, value| @todo.errors[key] << value }
+        record.errors.each { |key, value| @todo.errors.add(key, value) }
       end
       @saved = false
     end
@@ -1192,7 +1192,7 @@ end
     begin
       parse_date_per_user_prefs(date)
     rescue
-      @todo.errors[:base] << error_msg
+      @todo.errors.add(:base, error_msg)
     end
   end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8198025a..30b63172 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -125,7 +125,7 @@ class UsersController < ApplicationController
         unless user.new_record?
           render :body => t('users.user_created'), :status => 200
         else
-          render_failure user.errors.to_xml, 409
+          render_failure user.errors.full_messages.to_xml(root: "errors", skip_types: true), 409
         end
         return
       end
diff --git a/app/models/recurring_todos/abstract_recurrence_pattern.rb b/app/models/recurring_todos/abstract_recurrence_pattern.rb
index 91276f2e..2ad33b34 100644
--- a/app/models/recurring_todos/abstract_recurrence_pattern.rb
+++ b/app/models/recurring_todos/abstract_recurrence_pattern.rb
@@ -80,11 +80,11 @@ module RecurringTodos
     end
 
     def validate_not_blank(object, msg)
-      errors[:base] << msg if object.blank?
+      errors.add(:base, msg) if object.blank?
     end
 
     def validate_not_nil(object, msg)
-      errors[:base] << msg if object.nil?
+      errors.add(:base, msg) if object.nil?
     end
 
     def validate
@@ -100,7 +100,7 @@ module RecurringTodos
       when "ends_on_end_date"
         validate_not_blank(end_date, "The end date needs to be filled in for 'Ends on'")
       else
-        errors[:base] << "The end of the recurrence is not selected" unless ends_on == "no_end_date"
+        errors.add(:base, "The end of the recurrence is not selected") unless ends_on == "no_end_date"
       end
     end
 
@@ -113,7 +113,7 @@ module RecurringTodos
         validate_not_nil(show_always?, "Please select when to show the action")
         validate_not_blank(show_from_delta, "Please fill in the number of days to show the todo before the due date") unless show_always?
       else
-        errors[:base] << "Unexpected value of recurrence target selector '#{target}'"
+        errors.add(:base, "Unexpected value of recurrence target selector '#{target}'")
       end
     end
 
diff --git a/app/models/recurring_todos/daily_recurrence_pattern.rb b/app/models/recurring_todos/daily_recurrence_pattern.rb
index 35a0ea16..8caaa716 100644
--- a/app/models/recurring_todos/daily_recurrence_pattern.rb
+++ b/app/models/recurring_todos/daily_recurrence_pattern.rb
@@ -24,7 +24,7 @@ module RecurringTodos
 
     def validate
       super
-      errors[:base] << "Every other nth day may not be empty for this daily recurrence setting" if (!only_work_days?) && every_x_days.blank?
+      errors.add(:base, "Every other nth day may not be empty for this daily recurrence setting") if (!only_work_days?) && every_x_days.blank?
     end
 
     def get_next_date(previous)
diff --git a/app/models/recurring_todos/weekly_recurrence_pattern.rb b/app/models/recurring_todos/weekly_recurrence_pattern.rb
index 5ba3a13f..c554b016 100644
--- a/app/models/recurring_todos/weekly_recurrence_pattern.rb
+++ b/app/models/recurring_todos/weekly_recurrence_pattern.rb
@@ -30,7 +30,7 @@ module RecurringTodos
       super
       validate_not_blank(every_x_week, "Every other nth week may not be empty for weekly recurrence setting")
       something_set = %w{ sunday monday tuesday wednesday thursday friday saturday }.inject(false) { |set, day| set || send("on_#{day}") }
-      errors[:base] << "You must specify at least one day on which the todo recurs" unless something_set
+      errors.add(:base, "You must specify at least one day on which the todo recurs") unless something_set
     end
 
     def get_next_date(previous)
diff --git a/db/migrate/038_projects_contexts_remove_not_null_from_position.rb b/db/migrate/038_projects_contexts_remove_not_null_from_position.rb
index af167857..45ea7c26 100644
--- a/db/migrate/038_projects_contexts_remove_not_null_from_position.rb
+++ b/db/migrate/038_projects_contexts_remove_not_null_from_position.rb
@@ -1,7 +1,7 @@
 class ProjectsContextsRemoveNotNullFromPosition < ActiveRecord::Migration[5.2]
   def self.up
-    change_column :projects, :position, :integer, {:null => true, :default => nil}
-    change_column :contexts, :position, :integer, {:null => true, :default => nil}
+    change_column :projects, :position, :integer, :null => true, :default => nil
+    change_column :contexts, :position, :integer, :null => true, :default => nil
   end
 
   def self.down
@@ -10,13 +10,13 @@ class ProjectsContextsRemoveNotNullFromPosition < ActiveRecord::Migration[5.2]
       project.position = 0 if !project.position?
       project.save
     end
-    change_column :projects, :position, :integer, {:null => false, :default => nil}
+    change_column :projects, :position, :integer, :null => false, :default => nil
 
     @contexts = Context.find(:all)
     @contexts.each do |context|
       context.position = 0 if !context.position?
       context.save
     end
-    change_column :contexts, :position, :integer, {:null => false, :default => nil}
+    change_column :contexts, :position, :integer, :null => false, :default => nil
   end
 end
diff --git a/test/models/todo_test.rb b/test/models/todo_test.rb
index c257c0fe..dd1e084b 100644
--- a/test/models/todo_test.rb
+++ b/test/models/todo_test.rb
@@ -102,7 +102,7 @@ class TodoTest < ActiveSupport::TestCase
     @not_completed2
     assert_equal :active, @not_completed2.aasm.current_state
     @not_completed2.show_from = Time.zone.now + 1.week
-    assert @not_completed2.save, "should have saved successfully" + @not_completed2.errors.to_xml
+    assert @not_completed2.save, "should have saved successfully " + @not_completed2.errors.full_messages.to_s
     assert_equal :deferred, @not_completed2.aasm.current_state
   end
 
@@ -112,14 +112,14 @@ class TodoTest < ActiveSupport::TestCase
     todo.show_from = next_week
     todo.context_id = 1
     todo.description = 'foo'
-    assert todo.save, "should have saved successfully" + todo.errors.to_xml
+    assert todo.save, "should have saved successfully" + todo.errors.full_messages.to_s
     assert_equal :deferred, todo.aasm.current_state
   end
 
   def test_create_a_new_deferred_todo_by_passing_attributes
     user = users(:other_user)
     todo = user.todos.build(:show_from => next_week, :context_id => 1, :description => 'foo')
-    assert todo.save, "should have saved successfully" + todo.errors.to_xml
+    assert todo.save, "should have saved successfully " + todo.errors.full_messages.to_s
     assert_equal :deferred, todo.aasm.current_state
   end
 
@@ -551,7 +551,7 @@ class TodoTest < ActiveSupport::TestCase
     new_path = attachment.file.path
 
     # then the attachment should be there
-    assert File.exists?(new_path), "attachment should be on file system"
+    assert File.exist?(new_path), "attachment should be on file system"
     assert_equal 1, todo.attachments.reload.count, "should have one attachment"
 
     # When I destroy the todo
@@ -559,7 +559,7 @@ class TodoTest < ActiveSupport::TestCase
 
     # Then the attachement and file should nogt be there anymore
     assert_equal 0, todo.user.attachments.reload.count
-    assert !File.exists?(new_path), "attachment should not be on file system"
+    assert !File.exist?(new_path), "attachment should not be on file system"
   end
 
   def test_destroying_action_activates_successors

From a94d4fa00baeb4c78b4d1f3ff675f7ae322493a3 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 02:04:29 +0300
Subject: [PATCH 617/767] Remove the inbound message handling to get the Rails
 upgrade done. Pull requests for re-implementing with ActionMailbox are
 welcome.

Fixes #2463.
---
 app/controllers/integrations_controller.rb    |  26 +---
 app/controllers/mailgun_controller.rb         |  36 -----
 app/models/message_gateway.rb                 | 141 ------------------
 app/views/integrations/index.html.erb         |  37 -----
 .../integrations_controller_test.rb           |  61 --------
 test/controllers/mailgun_controller_test.rb   |  74 ---------
 test/controllers/message_gateway_test.rb      | 103 -------------
 7 files changed, 1 insertion(+), 477 deletions(-)
 delete mode 100644 app/controllers/mailgun_controller.rb
 delete mode 100644 app/models/message_gateway.rb
 delete mode 100644 test/controllers/mailgun_controller_test.rb
 delete mode 100644 test/controllers/message_gateway_test.rb

diff --git a/app/controllers/integrations_controller.rb b/app/controllers/integrations_controller.rb
index bb47497b..fd5b4238 100644
--- a/app/controllers/integrations_controller.rb
+++ b/app/controllers/integrations_controller.rb
@@ -1,8 +1,7 @@
 class IntegrationsController < ApplicationController
   require 'mail'
 
-  skip_before_action :login_required, :only => [:cloudmailin, :search_plugin]
-  skip_before_action :verify_authenticity_token, only: [:cloudmailin]
+  skip_before_action :login_required, :only => [:search_plugin]
 
   def index
     @page_title = 'TRACKS::Integrations'
@@ -21,31 +20,8 @@ class IntegrationsController < ApplicationController
       .pack('m').gsub(/\n/, '')
   end
 
-  def cloudmailin
-    if !verify_cloudmailin_signature
-      render :body => "Message signature verification failed.", :status => 403
-      return false
-    end
-
-    if process_message(params[:message])
-      render :body => 'success', :status => 200
-    else
-      render :body => "No user found or other error", :status => 404
-    end
-  end
-
   private
 
-  def process_message(message)
-    MessageGateway.receive(Mail.new(message))
-  end
-
-  def verify_cloudmailin_signature
-    provided = request.request_parameters.delete(:signature)
-    signature = Digest::MD5.hexdigest(flatten_params(request.request_parameters).sort.map { |k, v| v }.join + SITE_CONFIG['cloudmailin'])
-    return provided == signature
-  end
-
   def flatten_params(params, title = nil, result = {})
     params.each do |key, value|
       if value.is_a? Hash
diff --git a/app/controllers/mailgun_controller.rb b/app/controllers/mailgun_controller.rb
deleted file mode 100644
index d3eac091..00000000
--- a/app/controllers/mailgun_controller.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'openssl'
-
-class MailgunController < ApplicationController
-  skip_before_action :login_required, :only => [:mailgun]
-  before_action :verify, :only => [:mailgun]
-  protect_from_forgery with: :null_session
-
-  def mailgun
-    unless params.include? 'body-mime'
-      Rails.logger.info "Cannot process Mailgun request, no body-mime sent"
-      render_failure "Unacceptable body-mime", 406
-      return
-    end
-
-    todo = MessageGateway.receive(params['body-mime'])
-    if todo
-      render :xml => todo.to_xml(*todo_xml_params)
-    else
-      render_failure "Todo not saved", 406
-    end
-  end
-
-  private
-
-  def verify
-    unless params['signature'] == OpenSSL::HMAC.hexdigest(
-            OpenSSL::Digest.new('sha256'),
-            SITE_CONFIG['mailgun_api_key'],
-            '%s%s' % [params['timestamp'], params['token']]
-         )
-      Rails.logger.info "Cannot verify Mailgun signature"
-      render_failure "Access denied", 406
-      return
-    end
-  end
-end
diff --git a/app/models/message_gateway.rb b/app/models/message_gateway.rb
deleted file mode 100644
index 2a125cd7..00000000
--- a/app/models/message_gateway.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-class MessageGateway < ActionMailer::Base
-  def receive(email)
-    user = get_receiving_user_from_email_address(email)
-    return false if user.nil?
-    return false unless check_sender_is_in_mailmap(user, email)
-
-    context = user.prefs.sms_context
-    todo_params = get_todo_params(email)
-
-    todo_builder = TodoFromRichMessage.new(user, context.id, todo_params[:description], todo_params[:notes])
-    todo = todo_builder.construct
-
-    if todo.save!
-      Rails.logger.info "Saved email as todo for user #{user.login} in context #{context.name}"
-
-      if attach_email_to_todo(todo, email)
-        Rails.logger.info "Saved email as attachment to todo for user #{user.login} in context #{context.name}"
-      end
-    end
-    todo
-  end
-
-  private
-
-  def attach_email_to_todo(todo, email)
-    attachment = todo.attachments.build
-
-    # create temp file
-    tmp = Tempfile.new(['attachment', '.eml'], universal_newline: true)
-    tmp.write email.raw_source.gsub(/\r/, "")
-
-    # add temp file to attachment. paperclip will copy the file to the right location
-    Rails.logger.info "Saved received email to #{tmp.path}"
-    attachment.file = tmp
-    tmp.close
-    saved = attachment.save!
-
-    # enable write permissions on group, since MessageGateway could be run under different
-    # user than Tracks (i.e. apache versus mail)
-    dir = File.open(File.dirname(attachment.file.path))
-    dir.chmod(0770)
-
-    # delete temp file
-    tmp.unlink
-  end
-
-  def get_todo_params(email)
-    params = {}
-
-    if email.multipart?
-      params[:description] = get_text_or_nil(email.subject)
-      params[:notes]       = get_first_text_plain_part(email)
-    else
-      if email.subject.blank?
-        params[:description] = get_decoded_text_or_nil(email.body)
-        params[:notes]       = nil
-      else
-        params[:description] = get_text_or_nil(email.subject)
-        params[:notes]       = get_decoded_text_or_nil(email.body)
-      end
-    end
-    params
-  end
-
-  def get_receiving_user_from_email_address(email)
-    SITE_CONFIG['email_dispatch'] == 'single_user' ? get_receiving_user_from_env_setting : get_receiving_user_from_mail_header(email)
-  end
-
-  def get_receiving_user_from_env_setting
-    Rails.logger.info "All received email goes to #{ENV['TRACKS_MAIL_RECEIVER']}"
-    user = User.where(:login => ENV['TRACKS_MAIL_RECEIVER']).first
-    Rails.logger.info "WARNING: Unknown user set for TRACKS_MAIL_RECEIVER (#{ENV['TRACKS_MAIL_RECEIVER']})" if user.nil?
-    return user
-  end
-
-  def get_receiving_user_from_mail_header(email)
-    user = get_receiving_user_from_sms_email(get_address(email))
-    Rails.logger.info(user.nil? ? "User unknown" : "Email belongs to #{user.login}")
-    return user
-  end
-
-  def get_address(email)
-    return SITE_CONFIG['email_dispatch'] == 'to' ? email.to[0] : email.from[0]
-  end
-
-  def get_receiving_user_from_sms_email(address)
-    Rails.logger.info "Looking for user with email #{address}"
-    user = User.where("preferences.sms_email" => address.strip).includes(:preference).first
-    user = User.where("preferences.sms_email" => address.strip[1.100]).includes(:preference).first if user.nil?
-    return user
-  end
-
-  def check_sender_is_in_mailmap(user, email)
-    if user.present? && !sender_is_in_mailmap?(user, email)
-      Rails.logger.warn "#{email.from[0]} not found in mailmap for #{user.login}"
-      return false
-    end
-    return true
-  end
-
-  def sender_is_in_mailmap?(user, email)
-    if (SITE_CONFIG['mailmap'].is_a? Hash) && SITE_CONFIG['email_dispatch'] == 'to'
-      # Look for the sender in the map of allowed senders
-      SITE_CONFIG['mailmap'][user.preference.sms_email].include? email.from[0]
-    else
-      # We can't check the map if it's not defined, or if the lookup is the
-      # wrong way round, so just allow it
-      true
-    end
-  end
-
-  def get_text_or_nil(text)
-    return text ? text.strip : nil
-  end
-
-  def get_decoded_text_or_nil(text)
-    return text ? text.decoded.strip : nil
-  end
-
-  def get_first_text_plain_part(email)
-    # get all parts from multipart/alternative attachments
-    parts = get_all_parts(email.parts)
-
-    # remove all parts that are not text/plain
-    parts.reject { |part| !part.content_type.start_with?("text/plain") }
-
-    return parts.count > 0 ? parts[0].decoded.strip : ""
-  end
-
-  def get_all_parts(parts)
-    # return a flattened array of parts. If a multipart attachment is found, recurse over its parts
-    all_parts = parts.inject([]) do |set, elem|
-      if elem.content_type.start_with?("multipart/alternative")
-        # recurse to handle multiparts in this multipart
-        set += get_all_parts(elem.parts)
-      else
-        set << elem
-      end
-    end
-  end
-end
diff --git a/app/views/integrations/index.html.erb b/app/views/integrations/index.html.erb
index 5de4fbf9..a8db5c15 100644
--- a/app/views/integrations/index.html.erb
+++ b/app/views/integrations/index.html.erb
@@ -4,8 +4,6 @@
 
    <%= I18n.t 'integrations.contents_header' %>
    
 
 
    <%= raw I18n.t 'integrations.add_your_own', tell_us_link: link_to(I18n.t('integrations.tell_us_link_text'), 'https://github.com/TracksApp/tracks/issues') %>
    
@@ -19,41 +17,6 @@
 
 
    <%= raw I18n.t 'integrations.cron_2', feeds_link: link_to(I18n.t('integrations.feeds_link_text'), feeds_path) %>
    
 
- 
-
    <%= I18n.t 'integrations.sections.message_gateway' %>
    
-
    <%= I18n.t 'integrations.message_gateway.description' %>
    
-
      
-  
    • <%= raw I18n.t 'integrations.message_gateway.instructions.1', preferences_link: link_to(t('layouts.navigation.preferences'), preferences_url), sms_email_name: Preference.human_attribute_name('sms_email'), sms_context_name: Preference.human_attribute_name('sms_context') %>
      • 
-  
    • <%= raw I18n.t 'integrations.message_gateway.instructions.2', command: "
      /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
      " %>
      • 
-  
    • <%= I18n.t 'integrations.message_gateway.instructions.3' %>
      • 
-
    
-
    <%= I18n.t 'integrations.message_gateway.rich_api_tip' %>
    
-
    <%= raw I18n.t 'integrations.message_gateway.configuration', site_yml: 'site.yml', to_name: 'to:', from_name: 'from:' %>
    
-
    <%= raw I18n.t 'integrations.message_gateway.one_user_configuration', single_user_value: 'single_user', code: "
    TRACKS_MAIL_RECEIVER=" + current_user.login + " /PATH/TO/TRACKS/bin/rails r -e production 'MessageGateway.receive(STDIN.read)'
    " %>
    
-
- 
-
    <%= I18n.t 'integrations.sections.mailgun' %>
    
-
    <%= raw I18n.t 'integrations.mailgun.description', mailgun_link: link_to('Mailgun', 'http://www.mailgun.com/') %>
    
-
    <%= I18n.t 'integrations.mailgun.conditions' %>
    
-
      
-  
    • <%= raw I18n.t 'integrations.mailgun.instructions.1', mailgun_link: link_to('Mailgun', 'http://www.mailgun.com/') %>
      • 
-  
    • <%= I18n.t 'integrations.mailgun.instructions.2' %>
      • 
-  
        
-    
      • <%= I18n.t 'integrations.mailgun.instructions.2a' %>
        • 
-    
      • <%= I18n.t 'integrations.mailgun.instructions.2b' %>
        • 
-  
      
-  
    • <%= raw I18n.t 'integrations.mailgun.instructions.3', preferences_link: link_to(t('layouts.navigation.preferences'), preferences_url), sms_email_name: Preference.human_attribute_name('sms_email') %>
      • 
-  
    • <%= I18n.t 'integrations.mailgun.instructions.4', sms_context_name: Preference.human_attribute_name('sms_context') %>
      • 
-  
    • <%= I18n.t 'integrations.mailgun.instructions.5' %>
      • 
-  
    • <%= raw I18n.t 'integrations.mailgun.instructions.6', code: '
      -mailmap:
-  tracks@user.mailgun.org:
-  - me@myhome.example.net
-  - mr.user@work.example.com
-
      ' %>
      • 
-
    
-
    <%= I18n.t 'integrations.mailgun.gateway_instructions' %>
    
-
  
 
    <%= I18n.t 'integrations.sections.email_rich' %>
    
 
    <%= I18n.t 'integrations.email_rich.description' %>
    
diff --git a/test/controllers/integrations_controller_test.rb b/test/controllers/integrations_controller_test.rb
index d01c0e06..bfbcd42d 100644
--- a/test/controllers/integrations_controller_test.rb
+++ b/test/controllers/integrations_controller_test.rb
@@ -13,65 +13,4 @@ class IntegrationsControllerTest < ActionController::TestCase
     assert_response :success
   end
   
-  def test_cloudmailin_integration_success
-    stub_site_config do
-      SITE_CONFIG['cloudmailin'] = "123456789"
-      SITE_CONFIG['email_dispatch'] = 'from'
-      post :cloudmailin, params: {
-        "html"=>"",
-        "plain"=>"asdasd",
-        "x_to_header"=>"[\"81496ecea21032d35a7a@cloudmailin.net\"]",
-        "disposable"=>"",
-        "from"=>"5555555555@tmomail.net",
-        "signature"=>"e85e908fb893394762047c21e54ce248",
-        "to"=>"<123123@cloudmailin.net>",
-        "subject"=>"asd",
-        "x_cc_header"=>"",
-        "message"=>"Received: from VMBX103.ihostexchange.net ([192.168.3.3]) by\r\n HUB103.ihostexchange.net ([66.46.182.53]) with mapi; Wed, 5 Oct 2011 17:12:44\r\n -0400\r\nFrom: SMS User <5555555555@tmomail.net>\r\nTo: Tracks <123123@cloudmailin.net>\r\nDate: Wed, 5 Oct 2011 17:12:43 -0400\r\nSubject: asd\r\nThread-Topic: asd\r\nThread-Index: AcyDo4aig2wghvcsTAOkleWqi4t/FQ==\r\nMessage-ID: <7D7CB176-7559-4997-A301-8DF9726264C7@tmomail.net>\r\nAccept-Language: de-DE, en-US\r\nContent-Language: en-US\r\nX-MS-Has-Attach:\r\nX-MS-TNEF-Correlator:\r\nacceptlanguage: de-DE, en-US\r\nContent-Type: text/plain; charset=\"us-ascii\"\r\nContent-Transfer-Encoding: quoted-printable\r\nMIME-Version: 1.0\r\n\r\nasdasd\r\n"
-      }
-
-      assert_response :success
-    end
-  end
-  
-  def test_cloudmailin_integration_invalid_signature
-    stub_site_config do
-      SITE_CONFIG['cloudmailin'] = "12345678901234567890"
-      post :cloudmailin, params: {
-        "html"=>"",
-        "plain"=>"asdasd",
-        "x_to_header"=>"[\"81496ecea21032d35a7a@cloudmailin.net\"]",
-        "disposable"=>"",
-        "from"=>"5555555555@tmomail.net",
-        "signature"=>"e85e908fb893394762047c21e54ce248",
-        "to"=>"<123123@cloudmailin.net>",
-        "subject"=>"asd",
-        "x_cc_header"=>"",
-        "message"=>"Received: from VMBX103.ihostexchange.net ([192.168.3.3]) by\r\n HUB103.ihostexchange.net ([66.46.182.53]) with mapi; Wed, 5 Oct 2011 17:12:44\r\n -0400\r\nFrom: SMS User <5555555555@tmomail.net>\r\nTo: Tracks <123123@cloudmailin.net>\r\nDate: Wed, 5 Oct 2011 17:12:43 -0400\r\nSubject: asd\r\nThread-Topic: asd\r\nThread-Index: AcyDo4aig2wghvcsTAOkleWqi4t/FQ==\r\nMessage-ID: <7D7CB176-7559-4997-A301-8DF9726264C7@tmomail.net>\r\nAccept-Language: de-DE, en-US\r\nContent-Language: en-US\r\nX-MS-Has-Attach:\r\nX-MS-TNEF-Correlator:\r\nacceptlanguage: de-DE, en-US\r\nContent-Type: text/plain; charset=\"us-ascii\"\r\nContent-Transfer-Encoding: quoted-printable\r\nMIME-Version: 1.0\r\n\r\nasdasd\r\n"
-      }
-
-      assert_response 403
-    end
-  end
-  
-  def test_cloudmailin_integration_unknown_address
-    stub_site_config do
-      SITE_CONFIG['cloudmailin'] = "123456789"
-      post :cloudmailin, params: {
-        "html"=>"",
-        "plain"=>"asdasd",
-        "x_to_header"=>"[\"81496ecea21032d35a7a@cloudmailin.net\"]",
-        "disposable"=>"",
-        "from"=>"444444444444@tmomail.net",
-        "signature"=>"6d2df0e807bfa9b77d24c31dce6d4515",
-        "to"=>"<123123@cloudmailin.net>",
-        "subject"=>"asd",
-        "x_cc_header"=>"",
-        "message"=>"Received: from VMBX103.ihostexchange.net ([192.168.3.3]) by\r\n HUB103.ihostexchange.net ([66.46.182.53]) with mapi; Wed, 5 Oct 2011 17:12:44\r\n -0400\r\nFrom: SMS User <444444444444@tmomail.net>\r\nTo: Tracks <123123@cloudmailin.net>\r\nDate: Wed, 5 Oct 2011 17:12:43 -0400\r\nSubject: asd\r\nThread-Topic: asd\r\nThread-Index: AcyDo4aig2wghvcsTAOkleWqi4t/FQ==\r\nMessage-ID: <7D7CB176-7559-4997-A301-8DF9726264C7@tmomail.net>\r\nAccept-Language: de-DE, en-US\r\nContent-Language: en-US\r\nX-MS-Has-Attach:\r\nX-MS-TNEF-Correlator:\r\nacceptlanguage: de-DE, en-US\r\nContent-Type: text/plain; charset=\"us-ascii\"\r\nContent-Transfer-Encoding: quoted-printable\r\nMIME-Version: 1.0\r\n\r\nasdasd\r\n"
-      }
-
-      assert_response 404
-    end
-  end
-  
 end
diff --git a/test/controllers/mailgun_controller_test.rb b/test/controllers/mailgun_controller_test.rb
deleted file mode 100644
index 0b1300e2..00000000
--- a/test/controllers/mailgun_controller_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require 'test_helper'
-require 'support/stub_site_config_helper'
-
-class MailgunControllerTest < ActionController::TestCase
-  include StubSiteConfigHelper
-
-  def setup
-    @user = users(:sms_user)
-    @inbox = contexts(:inbox)
-  end
-
-  def load_message(filename)
-    File.read(File.join(Rails.root, 'test', 'fixtures', filename))
-  end
-
-  def test_mailgun_signature_verifies
-    stub_site_config do
-      SITE_CONFIG['mailgun_api_key'] = "123456789"
-      SITE_CONFIG['email_dispatch']  = 'from'
-
-      post :mailgun, params: {
-        "timestamp" => "1379539674",
-        "token"     => "5km6cwo0e3bfvg78hw4s69znro09xhk1h8u6-s633yasc8hcr5",
-        "signature" => "da92708b8f2c9dcd7ecdc91d52946c01802833e6683e46fc00b3f081920dd5b1",
-        "body-mime" => load_message('mailgun_message1.txt')
-      }
-
-      assert_response :success
-    end
-  end
-
-  def test_mailgun_creates_todo_with_mailmap
-    stub_site_config do
-      SITE_CONFIG['mailgun_api_key'] = "123456789"
-      SITE_CONFIG['email_dispatch']  = 'to'
-      SITE_CONFIG['mailmap']         = {
-        '5555555555@tmomail.net' => ['incoming@othermail.com', 'notused@foo.org']
-      }
-
-      todo_count = Todo.count
-      post :mailgun, params: {
-        "timestamp" => "1379539674",
-        "token"     => "5km6cwo0e3bfvg78hw4s69znro09xhk1h8u6-s633yasc8hcr5",
-        "signature" => "da92708b8f2c9dcd7ecdc91d52946c01802833e6683e46fc00b3f081920dd5b1",
-        "body-mime" => load_message('mailgun_message2.txt')
-      }
-
-      assert_response :success
-
-      assert_equal(todo_count+1, Todo.count)
-      message_todo = Todo.where(:description => "test").first
-      assert_not_nil(message_todo)
-      assert_equal(@inbox, message_todo.context)
-      assert_equal(@user, message_todo.user)
-    end
-  end
-
-  def test_mailgun_signature_fails
-    stub_site_config do
-      SITE_CONFIG['mailgun_api_key'] = "invalidkey"
-      SITE_CONFIG['email_dispatch']  = 'from'
-
-      post :mailgun, params: {
-        "timestamp" => "1379539674",
-        "token"     => "5km6cwo0e3bfvg78hw4s69znro09xhk1h8u6-s633yasc8hcr5",
-        "signature" => "da92708b8f2c9dcd7ecdc91d52946c01802833e6683e46fc00b3f081920dd5b1",
-        "body-mime" => load_message('mailgun_message1.txt')
-      }
-
-      assert_response 406
-    end
-  end
-
-end
diff --git a/test/controllers/message_gateway_test.rb b/test/controllers/message_gateway_test.rb
deleted file mode 100644
index 6bb3eab9..00000000
--- a/test/controllers/message_gateway_test.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'test_helper'
-
-class MessageGatewayTest < ActiveSupport::TestCase
-
-  def setup
-    @user = users(:sms_user)
-    @inbox = contexts(:inbox)
-  end
-
-  def load_message(filename)
-    MessageGateway.receive(File.read(File.join(Rails.root, 'test', 'fixtures', filename)))
-  end
-
-  def test_sms_with_no_subject
-    todo_count = Todo.count
-
-    load_message('sample_sms.txt')
-    # assert some stuff about it being created
-    assert_equal(todo_count+1, Todo.count)
-
-    message_todo = Todo.where(:description => "message_content").first
-    assert_not_nil(message_todo)
-
-    assert_equal(@inbox, message_todo.context)
-    assert_equal(@user, message_todo.user)
-  end
-
-  def test_mms_with_subject
-    todo_count = Todo.count
-
-    load_message('sample_mms.txt')
-
-    # assert some stuff about it being created
-    assert_equal(todo_count+1, Todo.count)
-
-    message_todo = Todo.where(:description => "This is the subject").first
-    assert_not_nil(message_todo)
-
-    assert_equal(@inbox, message_todo.context)
-    assert_equal(@user, message_todo.user)
-    assert_equal("This is the message body", message_todo.notes)
-  end
-
-  def test_email_with_winmail_dat
-    todo_count = Todo.count
-
-    load_message('email_with_winmail.txt')
-
-    # assert some stuff about it being created
-    assert_equal(todo_count+1, Todo.count)
-  end
-
-  def test_email_with_multipart_attachments
-    todo_count = Todo.count
-
-    load_message('email_with_multipart.txt')
-
-    # assert some stuff about it being created
-    assert_equal(todo_count+1, Todo.count)
-  end
-
-  def test_no_user
-    todo_count = Todo.count
-    badmessage = File.read(File.join(Rails.root, 'test', 'fixtures', 'sample_sms.txt'))
-    badmessage.gsub!("5555555555", "notauser")
-    MessageGateway.receive(badmessage)
-    assert_equal(todo_count, Todo.count)
-  end
-
-  def test_direct_to_context
-    message = File.read(File.join(Rails.root, 'test', 'fixtures', 'sample_sms.txt'))
-
-    valid_context_msg = message.gsub('message_content', 'this is a task @ anothercontext')
-    invalid_context_msg = message.gsub('message_content', 'this is also a task @ notacontext')
-
-    MessageGateway.receive(valid_context_msg)
-    valid_context_todo = Todo.where(:description => "this is a task").first
-    assert_not_nil(valid_context_todo)
-    assert_equal(contexts(:anothercontext), valid_context_todo.context)
-
-    MessageGateway.receive(invalid_context_msg)
-    invalid_context_todo = Todo.where(:description => 'this is also a task').first
-    assert_not_nil(invalid_context_todo)
-    assert_equal(@inbox, invalid_context_todo.context)
-  end
-
-  def test_receiving_email_adds_attachment
-    attachment_count = Attachment.count
-
-    load_message('sample_mms.txt')
-
-    message_todo = Todo.where(:description => "This is the subject").first
-    assert_not_nil(message_todo)
-
-    assert_equal attachment_count+1, Attachment.count
-    assert_equal 1,message_todo.attachments.count
-
-    orig = File.read(File.join(Rails.root, 'test', 'fixtures', 'sample_mms.txt'))
-    attachment = File.read(message_todo.attachments.first.file.path)
-
-    assert_equal orig, attachment
-  end
-end

From 1be3c2716542da9e225f3a4a9941689d1db6840c Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 01:16:18 +0300
Subject: [PATCH 618/767] Run tests for Ruby 3.1 and change from racer to
 mini_racer for Ruby 3.1 support

---
 .github/workflows/continuous-integration.yml  |  2 +-
 Dockerfile                                    |  2 +-
 Dockerfile-3.0                                | 30 -------------------
 Dockerfile-2.6 => Dockerfile-3.1              |  2 +-
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 10 +++----
 test-envs/docker-compose-3.0-mysql.yml        |  2 +-
 test-envs/docker-compose-3.0-postgres.yml     |  2 +-
 test-envs/docker-compose-3.0-sqlite.yml       |  2 +-
 ...mysql.yml => docker-compose-3.1-mysql.yml} |  2 +-
 ...es.yml => docker-compose-3.1-postgres.yml} |  2 +-
 ...lite.yml => docker-compose-3.1-sqlite.yml} |  2 +-
 12 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 Dockerfile-3.0
 rename Dockerfile-2.6 => Dockerfile-3.1 (98%)
 rename test-envs/{docker-compose-2.7-mysql.yml => docker-compose-3.1-mysql.yml} (95%)
 rename test-envs/{docker-compose-2.7-postgres.yml => docker-compose-3.1-postgres.yml} (96%)
 rename test-envs/{docker-compose-2.7-sqlite.yml => docker-compose-3.1-sqlite.yml} (93%)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index f734c0af..f54f0828 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.0"]
+        ruby: ["3.0", "3.1"]
         db: [sqlite, mysql, postgres]
 
     steps:
diff --git a/Dockerfile b/Dockerfile
index bca1e0be..cbac9f7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7
+FROM ruby:3.0
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/Dockerfile-3.0 b/Dockerfile-3.0
deleted file mode 100644
index 534d5c92..00000000
--- a/Dockerfile-3.0
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ruby:3.0
-
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
-
-WORKDIR /app
-
-RUN touch /etc/app-env
-
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn
-
-COPY Gemfile* /app/
-RUN gem install bundler
-RUN bundle install --jobs 4
-
-RUN mkdir /app/log
-
-COPY . /app/
-COPY config/database.docker.yml /app/config/database.yml
-COPY config/site.docker.yml /app/config/site.yml
-
-RUN RAILS_ENV=production bundle exec rake assets:precompile
-
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
-
-EXPOSE 3000
-
-CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/Dockerfile-2.6 b/Dockerfile-3.1
similarity index 98%
rename from Dockerfile-2.6
rename to Dockerfile-3.1
index ee5f7de3..13ee22a2 100644
--- a/Dockerfile-2.6
+++ b/Dockerfile-3.1
@@ -1,4 +1,4 @@
-FROM ruby:2.6
+FROM ruby:3.1
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/Gemfile b/Gemfile
index ca474828..c2813691 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'tracks-chartjs-ror'
 gem 'will_paginate'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-gem 'therubyracer', group: :therubyracer
+gem 'mini_racer', group: :therubyracer
 
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
diff --git a/Gemfile.lock b/Gemfile.lock
index f01f1abf..9b43940b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,7 +157,7 @@ GEM
       mime-types
       terrapin (~> 0.6.0)
     language_server-protocol (3.17.0.3)
-    libv8 (3.16.14.19)
+    libv8-node (21.7.2.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -177,6 +177,8 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.23.1)
+    mini_racer (0.12.0)
+      libv8-node (~> 21.7.2.0)
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
@@ -252,7 +254,6 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (2.8.4)
-    ref (2.0.0)
     regexp_parser (2.8.3)
     reverse_markdown (2.1.1)
       nokogiri
@@ -326,9 +327,6 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.1)
@@ -375,6 +373,7 @@ DEPENDENCIES
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.2)
   listen
+  mini_racer
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.5)
@@ -393,7 +392,6 @@ DEPENDENCIES
   solargraph
   spring (~> 4)
   sqlite3
-  therubyracer
   tolk (~> 5.0.1)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)
diff --git a/test-envs/docker-compose-3.0-mysql.yml b/test-envs/docker-compose-3.0-mysql.yml
index 2cd0413f..67e67f17 100644
--- a/test-envs/docker-compose-3.0-mysql.yml
+++ b/test-envs/docker-compose-3.0-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-postgres.yml b/test-envs/docker-compose-3.0-postgres.yml
index 0c6d9b03..a66d41b2 100644
--- a/test-envs/docker-compose-3.0-postgres.yml
+++ b/test-envs/docker-compose-3.0-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-sqlite.yml b/test-envs/docker-compose-3.0-sqlite.yml
index ba4d3709..4fd50bd5 100644
--- a/test-envs/docker-compose-3.0-sqlite.yml
+++ b/test-envs/docker-compose-3.0-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-2.7-mysql.yml b/test-envs/docker-compose-3.1-mysql.yml
similarity index 95%
rename from test-envs/docker-compose-2.7-mysql.yml
rename to test-envs/docker-compose-3.1-mysql.yml
index 67e67f17..03f609e5 100644
--- a/test-envs/docker-compose-2.7-mysql.yml
+++ b/test-envs/docker-compose-3.1-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.1
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-2.7-postgres.yml b/test-envs/docker-compose-3.1-postgres.yml
similarity index 96%
rename from test-envs/docker-compose-2.7-postgres.yml
rename to test-envs/docker-compose-3.1-postgres.yml
index a66d41b2..8c826727 100644
--- a/test-envs/docker-compose-2.7-postgres.yml
+++ b/test-envs/docker-compose-3.1-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.1
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-2.7-sqlite.yml b/test-envs/docker-compose-3.1-sqlite.yml
similarity index 93%
rename from test-envs/docker-compose-2.7-sqlite.yml
rename to test-envs/docker-compose-3.1-sqlite.yml
index 4fd50bd5..925c1bc3 100644
--- a/test-envs/docker-compose-2.7-sqlite.yml
+++ b/test-envs/docker-compose-3.1-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.1
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

From 974af02dbf353af7ba5907ccda894db841ca41b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 07:02:55 +0000
Subject: [PATCH 619/767] Bump nokogiri from 1.15.5 to 1.16.5

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.15.5 to 1.16.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.15.5...v1.16.5)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b43940b..dcdae8bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,10 +175,10 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.23.1)
+    mini_portile2 (2.8.7)
     mini_racer (0.12.0)
       libv8-node (~> 21.7.2.0)
+    minitest (5.23.1)
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
@@ -193,7 +193,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.15.5)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -203,7 +203,7 @@ GEM
     pg (1.5.4)
     puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (2.2.9)
     rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)

From b79c983f36ad29f90c9f36b92e2ee6a2326fb74e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 07:02:58 +0000
Subject: [PATCH 620/767] Bump jquery-ui-rails from 6.0.1 to 7.0.0

Bumps [jquery-ui-rails](https://github.com/joliss/jquery-ui-rails) from 6.0.1 to 7.0.0.
- [Release notes](https://github.com/joliss/jquery-ui-rails/releases)
- [Changelog](https://github.com/jquery-ui-rails/jquery-ui-rails/blob/master/History.md)
- [Commits](https://github.com/joliss/jquery-ui-rails/compare/v6.0.1...v7.0.0)

---
updated-dependencies:
- dependency-name: jquery-ui-rails
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index c2813691..4c74ba02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'coffee-rails', '~> 5.0.0'
 
 gem 'jquery-rails', '~> 4.6'
-gem 'jquery-ui-rails', '~>6.0.1'
+gem 'jquery-ui-rails', '~>7.0.0'
 
 gem 'rails', '~> 6.1'
 gem 'sassc-rails', '~> 2.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b43940b..0d3525dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
+    jquery-ui-rails (7.0.0)
       railties (>= 3.2.16)
     json (2.7.1)
     kramdown (2.4.0)
@@ -170,15 +170,15 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.23.1)
+    mini_portile2 (2.8.7)
     mini_racer (0.12.0)
       libv8-node (~> 21.7.2.0)
+    minitest (5.23.1)
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
@@ -193,7 +193,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.15.5)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -203,7 +203,7 @@ GEM
     pg (1.5.4)
     puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (2.2.9)
     rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)
@@ -249,7 +249,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -327,7 +327,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
     tolk (5.0.1)
@@ -370,7 +370,7 @@ DEPENDENCIES
   htmlentities
   i18n-tasks (~> 1.0.13)
   jquery-rails (~> 4.6)
-  jquery-ui-rails (~> 6.0.1)
+  jquery-ui-rails (~> 7.0.0)
   kt-paperclip (~> 7.2)
   listen
   mini_racer

From 12d7b7911c039a0b38e74d5f5c3e5494c130d578 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 10:06:07 +0300
Subject: [PATCH 621/767] Start testing Ruby 3.2

---
 .github/workflows/continuous-integration.yml |  2 +-
 Dockerfile-3.2                               | 30 ++++++++++++++++++
 test-envs/docker-compose-3.2-mysql.yml       | 29 ++++++++++++++++++
 test-envs/docker-compose-3.2-postgres.yml    | 32 ++++++++++++++++++++
 test-envs/docker-compose-3.2-sqlite.yml      | 17 +++++++++++
 5 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile-3.2
 create mode 100644 test-envs/docker-compose-3.2-mysql.yml
 create mode 100644 test-envs/docker-compose-3.2-postgres.yml
 create mode 100644 test-envs/docker-compose-3.2-sqlite.yml

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index f54f0828..a06c56a4 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.0", "3.1"]
+        ruby: ["3.0", "3.1", "3.2"]
         db: [sqlite, mysql, postgres]
 
     steps:
diff --git a/Dockerfile-3.2 b/Dockerfile-3.2
new file mode 100644
index 00000000..0e143fd7
--- /dev/null
+++ b/Dockerfile-3.2
@@ -0,0 +1,30 @@
+FROM ruby:3.2
+
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN bundle config --global frozen 1
+
+WORKDIR /app
+
+RUN touch /etc/app-env
+
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && apt-get install -y yarn
+
+COPY Gemfile* /app/
+RUN gem install bundler
+RUN bundle install --jobs 4
+
+RUN mkdir /app/log
+
+COPY . /app/
+COPY config/database.docker.yml /app/config/database.yml
+COPY config/site.docker.yml /app/config/site.yml
+
+RUN RAILS_ENV=production bundle exec rake assets:precompile
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
+
+EXPOSE 3000
+
+CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/test-envs/docker-compose-3.2-mysql.yml b/test-envs/docker-compose-3.2-mysql.yml
new file mode 100644
index 00000000..48b2e6d9
--- /dev/null
+++ b/test-envs/docker-compose-3.2-mysql.yml
@@ -0,0 +1,29 @@
+version: '3'
+services:
+  db:
+    image: mysql:5.7
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
+      MYSQL_DATABASE: ${TRACKS_DB:-tracks}
+    volumes:
+      - db-data:/var/lib/mysql
+  web:
+    build:
+      context: ..
+      dockerfile: Dockerfile-3.2
+    environment:
+      # These are set in script/ci-build, so we need to pass-thru them.
+      RAILS_ENV: $RAILS_ENV
+      DATABASE_NAME: $DATABASE_NAME
+      DATABASE_USERNAME: root
+      DATABASE_PASSWORD_EMPTY: 1
+    volumes:
+      - ${VOLUME:-..}:/app:Z
+      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
+      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
+    ports:
+      - 3000:3000
+    depends_on:
+      - db
+volumes:
+  db-data:
diff --git a/test-envs/docker-compose-3.2-postgres.yml b/test-envs/docker-compose-3.2-postgres.yml
new file mode 100644
index 00000000..16711e2d
--- /dev/null
+++ b/test-envs/docker-compose-3.2-postgres.yml
@@ -0,0 +1,32 @@
+version: '3'
+services:
+  db:
+    image: postgres:13
+    environment:
+      POSTGRES_DB: ${DATABASE_NAME:-tracks}
+      POSTGRES_PASSWORD: password
+    volumes:
+      - db-data:/var/lib/postgresql/data
+  web:
+    build:
+      context: ..
+      dockerfile: Dockerfile-3.2
+    environment:
+      # These are set in script/ci-build, so we need to pass-thru them.
+      RAILS_ENV: $RAILS_ENV
+      DATABASE_NAME: $DATABASE_NAME
+      DATABASE_USERNAME: postgres
+      DATABASE_PASSWORD: password
+      DATABASE_TYPE: postgresql
+      DATABASE_ENCODING: unicode
+      DATABASE_PORT: 5432
+    volumes:
+      - ${VOLUME:-..}:/app:Z
+      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
+      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
+    ports:
+      - 3000:3000
+    depends_on:
+      - db
+volumes:
+  db-data:
diff --git a/test-envs/docker-compose-3.2-sqlite.yml b/test-envs/docker-compose-3.2-sqlite.yml
new file mode 100644
index 00000000..47a2e7e0
--- /dev/null
+++ b/test-envs/docker-compose-3.2-sqlite.yml
@@ -0,0 +1,17 @@
+version: '3'
+services:
+  web:
+    build:
+      context: ..
+      dockerfile: Dockerfile-3.2
+    environment:
+      # These are set in script/ci-build, so we need to pass-thru them.
+      RAILS_ENV: $RAILS_ENV
+      DATABASE_NAME: "/app/db.sqlite"
+      DATABASE_TYPE: sqlite3
+    volumes:
+      - ${VOLUME:-..}:/app:Z
+      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
+      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
+    ports:
+      - 3000:3000

From aefa65a4b4b756790f3127140ec247b8072bd646 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 10:19:38 +0300
Subject: [PATCH 622/767] Start testing Ruby 3.3

---
 .github/workflows/continuous-integration.yml |  2 +-
 Dockerfile-3.3                               | 30 ++++++++++++++++++
 test-envs/docker-compose-3.3-mysql.yml       | 29 ++++++++++++++++++
 test-envs/docker-compose-3.3-postgres.yml    | 32 ++++++++++++++++++++
 test-envs/docker-compose-3.3-sqlite.yml      | 17 +++++++++++
 5 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile-3.3
 create mode 100644 test-envs/docker-compose-3.3-mysql.yml
 create mode 100644 test-envs/docker-compose-3.3-postgres.yml
 create mode 100644 test-envs/docker-compose-3.3-sqlite.yml

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index a06c56a4..73431cd8 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.0", "3.1", "3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
         db: [sqlite, mysql, postgres]
 
     steps:
diff --git a/Dockerfile-3.3 b/Dockerfile-3.3
new file mode 100644
index 00000000..0e143fd7
--- /dev/null
+++ b/Dockerfile-3.3
@@ -0,0 +1,30 @@
+FROM ruby:3.2
+
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN bundle config --global frozen 1
+
+WORKDIR /app
+
+RUN touch /etc/app-env
+
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && apt-get install -y yarn
+
+COPY Gemfile* /app/
+RUN gem install bundler
+RUN bundle install --jobs 4
+
+RUN mkdir /app/log
+
+COPY . /app/
+COPY config/database.docker.yml /app/config/database.yml
+COPY config/site.docker.yml /app/config/site.yml
+
+RUN RAILS_ENV=production bundle exec rake assets:precompile
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
+
+EXPOSE 3000
+
+CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/test-envs/docker-compose-3.3-mysql.yml b/test-envs/docker-compose-3.3-mysql.yml
new file mode 100644
index 00000000..fe6891be
--- /dev/null
+++ b/test-envs/docker-compose-3.3-mysql.yml
@@ -0,0 +1,29 @@
+version: '3'
+services:
+  db:
+    image: mysql:5.7
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
+      MYSQL_DATABASE: ${TRACKS_DB:-tracks}
+    volumes:
+      - db-data:/var/lib/mysql
+  web:
+    build:
+      context: ..
+      dockerfile: Dockerfile-3.3
+    environment:
+      # These are set in script/ci-build, so we need to pass-thru them.
+      RAILS_ENV: $RAILS_ENV
+      DATABASE_NAME: $DATABASE_NAME
+      DATABASE_USERNAME: root
+      DATABASE_PASSWORD_EMPTY: 1
+    volumes:
+      - ${VOLUME:-..}:/app:Z
+      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
+      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
+    ports:
+      - 3000:3000
+    depends_on:
+      - db
+volumes:
+  db-data:
diff --git a/test-envs/docker-compose-3.3-postgres.yml b/test-envs/docker-compose-3.3-postgres.yml
new file mode 100644
index 00000000..759c880f
--- /dev/null
+++ b/test-envs/docker-compose-3.3-postgres.yml
@@ -0,0 +1,32 @@
+version: '3'
+services:
+  db:
+    image: postgres:13
+    environment:
+      POSTGRES_DB: ${DATABASE_NAME:-tracks}
+      POSTGRES_PASSWORD: password
+    volumes:
+      - db-data:/var/lib/postgresql/data
+  web:
+    build:
+      context: ..
+      dockerfile: Dockerfile-3.3
+    environment:
+      # These are set in script/ci-build, so we need to pass-thru them.
+      RAILS_ENV: $RAILS_ENV
+      DATABASE_NAME: $DATABASE_NAME
+      DATABASE_USERNAME: postgres
+      DATABASE_PASSWORD: password
+      DATABASE_TYPE: postgresql
+      DATABASE_ENCODING: unicode
+      DATABASE_PORT: 5432
+    volumes:
+      - ${VOLUME:-..}:/app:Z
+      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
+      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
+    ports:
+      - 3000:3000
+    depends_on:
+      - db
+volumes:
+  db-data:
diff --git a/test-envs/docker-compose-3.3-sqlite.yml b/test-envs/docker-compose-3.3-sqlite.yml
new file mode 100644
index 00000000..e838d3bb
--- /dev/null
+++ b/test-envs/docker-compose-3.3-sqlite.yml
@@ -0,0 +1,17 @@
+version: '3'
+services:
+  web:
+    build:
+      context: ..
+      dockerfile: Dockerfile-3.3
+    environment:
+      # These are set in script/ci-build, so we need to pass-thru them.
+      RAILS_ENV: $RAILS_ENV
+      DATABASE_NAME: "/app/db.sqlite"
+      DATABASE_TYPE: sqlite3
+    volumes:
+      - ${VOLUME:-..}:/app:Z
+      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
+      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
+    ports:
+      - 3000:3000

From 80c3b22e0455cbefa30dcfabe855054ec7ae6baa Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 10:46:36 +0300
Subject: [PATCH 623/767] Make 3.1 our default build

---
 .github/workflows/continuous-integration.yml | 5 +++++
 Dockerfile                                   | 2 +-
 Dockerfile-3.1 => Dockerfile-3.0             | 2 +-
 test-envs/docker-compose-3.0-mysql.yml       | 2 +-
 test-envs/docker-compose-3.0-postgres.yml    | 2 +-
 test-envs/docker-compose-3.0-sqlite.yml      | 2 +-
 test-envs/docker-compose-3.1-mysql.yml       | 2 +-
 test-envs/docker-compose-3.1-postgres.yml    | 2 +-
 test-envs/docker-compose-3.1-sqlite.yml      | 2 +-
 9 files changed, 13 insertions(+), 8 deletions(-)
 rename Dockerfile-3.1 => Dockerfile-3.0 (98%)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 73431cd8..3c238552 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -8,6 +8,11 @@ jobs:
       matrix:
         ruby: ["3.0", "3.1", "3.2", "3.3"]
         db: [sqlite, mysql, postgres]
+        exclude:
+          - ruby: "3.2"
+            db: sqlite
+          - ruby: "3.2"
+            db: postgres
 
     steps:
       - uses: actions/checkout@v1
diff --git a/Dockerfile b/Dockerfile
index cbac9f7a..45c90668 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.0
+FROM ruby:3.1
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/Dockerfile-3.1 b/Dockerfile-3.0
similarity index 98%
rename from Dockerfile-3.1
rename to Dockerfile-3.0
index 13ee22a2..534d5c92 100644
--- a/Dockerfile-3.1
+++ b/Dockerfile-3.0
@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.0
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/test-envs/docker-compose-3.0-mysql.yml b/test-envs/docker-compose-3.0-mysql.yml
index 67e67f17..2cd0413f 100644
--- a/test-envs/docker-compose-3.0-mysql.yml
+++ b/test-envs/docker-compose-3.0-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-postgres.yml b/test-envs/docker-compose-3.0-postgres.yml
index a66d41b2..0c6d9b03 100644
--- a/test-envs/docker-compose-3.0-postgres.yml
+++ b/test-envs/docker-compose-3.0-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-sqlite.yml b/test-envs/docker-compose-3.0-sqlite.yml
index 4fd50bd5..ba4d3709 100644
--- a/test-envs/docker-compose-3.0-sqlite.yml
+++ b/test-envs/docker-compose-3.0-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.1-mysql.yml b/test-envs/docker-compose-3.1-mysql.yml
index 03f609e5..67e67f17 100644
--- a/test-envs/docker-compose-3.1-mysql.yml
+++ b/test-envs/docker-compose-3.1-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.1-postgres.yml b/test-envs/docker-compose-3.1-postgres.yml
index 8c826727..a66d41b2 100644
--- a/test-envs/docker-compose-3.1-postgres.yml
+++ b/test-envs/docker-compose-3.1-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.1-sqlite.yml b/test-envs/docker-compose-3.1-sqlite.yml
index 925c1bc3..4fd50bd5 100644
--- a/test-envs/docker-compose-3.1-sqlite.yml
+++ b/test-envs/docker-compose-3.1-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

From 05854c65601a5f78a162b01ceedf2b2a6e573b06 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 6 Jun 2024 10:55:19 +0300
Subject: [PATCH 624/767] Update the netcat package name

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 45c90668..f1f6d7cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN bundle install --jobs 4
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn netcat
+RUN apt-get update && apt-get install -y yarn netcat-openbsd
 
 RUN mkdir /app/log
 

From 315042094054d2d5ddc1dba266dc6044a66f62eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 00:07:19 +0000
Subject: [PATCH 625/767] Bump font-awesome-sass from 6.5.1 to 6.5.2

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 6.5.1 to 6.5.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits/6.5.2)

---
updated-dependencies:
- dependency-name: font-awesome-sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c74ba02..fb6e978b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 6.1'
 gem 'sassc-rails', '~> 2.1.2'
 
 gem 'bootstrap-sass', '3.4.1'
-gem 'font-awesome-sass', '~> 6.5.1'
+gem 'font-awesome-sass', '~> 6.5.2'
 
 gem 'uglifier', '>=1.3.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d3525dc..fa70ae40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,8 +118,8 @@ GEM
     factory_bot_rails (6.4.2)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    ffi (1.16.3)
-    font-awesome-sass (6.5.1)
+    ffi (1.17.0)
+    font-awesome-sass (6.5.2)
       sassc (~> 2.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -366,7 +366,7 @@ DEPENDENCIES
   coffee-rails (~> 5.0.0)
   database_cleaner (~> 1)
   factory_bot_rails
-  font-awesome-sass (~> 6.5.1)
+  font-awesome-sass (~> 6.5.2)
   htmlentities
   i18n-tasks (~> 1.0.13)
   jquery-rails (~> 4.6)

From 781ae2de5c7580632d5ef3938d602d364b462813 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 00:07:44 +0000
Subject: [PATCH 626/767] Bump factory_bot_rails from 6.4.2 to 6.4.3

Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.4.2 to 6.4.3.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/main/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.4.2...v6.4.3)

---
updated-dependencies:
- dependency-name: factory_bot_rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d3525dc..37b451f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,7 +89,7 @@ GEM
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (7.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -113,9 +113,9 @@ GEM
     e2mmap (0.1.0)
     erubi (1.12.0)
     execjs (2.8.1)
-    factory_bot (6.4.2)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.2)
+    factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.16.3)

From b01f46e412b1f91121f7c6ffbb6b607a7d178892 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 00:07:59 +0000
Subject: [PATCH 627/767] Bump mysql2 from 0.5.5 to 0.5.6

Bumps [mysql2](https://github.com/brianmario/mysql2) from 0.5.5 to 0.5.6.
- [Release notes](https://github.com/brianmario/mysql2/releases)
- [Commits](https://github.com/brianmario/mysql2/compare/0.5.5...0.5.6)

---
updated-dependencies:
- dependency-name: mysql2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c74ba02..0d878485 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem 'mini_racer', group: :therubyracer
 
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
-gem 'mysql2', '~> 0.5.5', group: :mysql
+gem 'mysql2', '~> 0.5.6', group: :mysql
 gem 'pg', '~> 1.5.4', group: :postgresql
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d3525dc..f8c414eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
-    mysql2 (0.5.5)
+    mysql2 (0.5.6)
     net-imap (0.4.12)
       date
       net-protocol
@@ -376,7 +376,7 @@ DEPENDENCIES
   mini_racer
   minitest-stub-const
   mocha
-  mysql2 (~> 0.5.5)
+  mysql2 (~> 0.5.6)
   pg (~> 1.5.4)
   puma (~> 6.4)
   rack-mini-profiler

From a910eaf43681980c6958f223241372f744afab36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 00:30:11 +0000
Subject: [PATCH 628/767] Bump pg from 1.5.4 to 1.5.6

Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.4 to 1.5.6.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.4...v1.5.6)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b60b7ab4..7a327788 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'mini_racer', group: :therubyracer
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.6', group: :mysql
-gem 'pg', '~> 1.5.4', group: :postgresql
+gem 'pg', '~> 1.5.6', group: :postgresql
 
 group :development do
   gem 'spring', '~> 4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5c607026..1c49cf76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -200,7 +200,7 @@ GEM
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    pg (1.5.4)
+    pg (1.5.6)
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.8.0)
@@ -377,7 +377,7 @@ DEPENDENCIES
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.6)
-  pg (~> 1.5.4)
+  pg (~> 1.5.6)
   puma (~> 6.4)
   rack-mini-profiler
   rails (~> 6.1)

From d056abbc3a0b2b6cb1dbd39b0a565617007a68b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 00:39:26 +0000
Subject: [PATCH 629/767] Bump spring from 4.1.3 to 4.2.1

Bumps [spring](https://github.com/rails/spring) from 4.1.3 to 4.2.1.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v4.1.3...v4.2.1)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c49cf76..7fd34548 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -312,7 +312,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    spring (4.1.3)
+    spring (4.2.1)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)

From 180af5c7523961234db62ffe1773e634415d955e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 00:17:05 +0000
Subject: [PATCH 630/767] Bump will_paginate from 4.0.0 to 4.0.1

Bumps [will_paginate](https://github.com/mislav/will_paginate) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v4.0.0...v4.0.1)

---
updated-dependencies:
- dependency-name: will_paginate
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7fd34548..e6547b61 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -345,7 +345,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (4.0.0)
+    will_paginate (4.0.1)
     yard (0.9.36)
     zeitwerk (2.6.15)
 

From 9ba1f7a5e3efe7c5750fabae647aa30b207551eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 00:17:23 +0000
Subject: [PATCH 631/767] Bump rubocop from 1.58.0 to 1.64.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.58.0 to 1.64.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.58.0...v1.64.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7a327788..f0a141d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.58', require: false
+  gem 'rubocop', '~> 1.64', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 7fd34548..ed05cebc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (7.0.0)
       railties (>= 3.2.16)
-    json (2.7.1)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -196,8 +196,8 @@ GEM
     nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.25.1)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -254,28 +254,28 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (2.8.4)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.58.0)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
@@ -385,7 +385,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.2.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.58)
+  rubocop (~> 1.64)
   sanitize (~> 6.1)
   sassc-rails (~> 2.1.2)
   simplecov

From 2d5aba6ad0dc2a83053915b60df104917bd28c4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 00:10:06 +0000
Subject: [PATCH 632/767] Bump listen from 3.8.0 to 3.9.0

Bumps [listen](https://github.com/guard/listen) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.8.0...v3.9.0)

---
updated-dependencies:
- dependency-name: listen
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70cf3bc5..c259eeb8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -158,7 +158,7 @@ GEM
       terrapin (~> 0.6.0)
     language_server-protocol (3.17.0.3)
     libv8-node (21.7.2.0)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.22.0)
@@ -251,7 +251,7 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rbs (2.8.4)
     regexp_parser (2.9.2)

From 3a0ddc0c02d62969810cb794aca086d6626b6817 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 00:17:45 +0000
Subject: [PATCH 633/767] Bump i18n-tasks from 1.0.13 to 1.0.14

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.13 to 1.0.14.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.13...v1.0.14)

---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 25 ++++++++-----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index f0a141d4..30ad6230 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'solargraph'
 
-  gem 'i18n-tasks', '~> 1.0.13'
+  gem 'i18n-tasks', '~> 1.0.14'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c259eeb8..c6851fa4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,13 +79,6 @@ GEM
     backport (1.2.0)
     bcrypt (3.1.20)
     benchmark (0.3.0)
-    better_html (2.0.2)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
-      ast (~> 2.0)
-      erubi (~> 1.4)
-      parser (>= 2.4)
-      smart_properties
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
@@ -104,14 +97,14 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     crass (1.0.6)
     database_cleaner (1.99.0)
     date (3.3.4)
     diff-lcs (1.5.0)
     docile (1.1.5)
     e2mmap (0.1.0)
-    erubi (1.12.0)
+    erubi (1.13.0)
     execjs (2.8.1)
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
@@ -123,14 +116,13 @@ GEM
       sassc (~> 2.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    highline (2.1.0)
+    highline (3.0.1)
     htmlentities (4.3.4)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.13)
+    i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -193,11 +185,11 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -235,7 +227,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.8)
@@ -295,7 +287,6 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    smart_properties (1.17.0)
     solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
@@ -368,7 +359,7 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-sass (~> 6.5.2)
   htmlentities
-  i18n-tasks (~> 1.0.13)
+  i18n-tasks (~> 1.0.14)
   jquery-rails (~> 4.6)
   jquery-ui-rails (~> 7.0.0)
   kt-paperclip (~> 7.2)

From fd76ff273a57b84b01404fe8d57eaeee65022460 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Sat, 15 Jun 2024 14:30:13 +0300
Subject: [PATCH 634/767] Test deferred view

---
 app/views/todos/list_deferred.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/todos/list_deferred.html.erb b/app/views/todos/list_deferred.html.erb
index 599855b9..d26e70ee 100644
--- a/app/views/todos/list_deferred.html.erb
+++ b/app/views/todos/list_deferred.html.erb
@@ -11,5 +11,5 @@
 
    
 
    
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render :file => "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 
    

From 0eaa0d65c1bf0df819039447481f9ed8e06ba9e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 00:46:46 +0000
Subject: [PATCH 635/767] Bump sanitize from 6.1.0 to 6.1.1

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.1.0...v6.1.1)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c6851fa4..d4487d0e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sanitize (6.1.0)
+    sanitize (6.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)

From ddf0260a03930bcd4011e03b66d2f0f9663be9a7 Mon Sep 17 00:00:00 2001
From: gallegonovato 
Date: Sat, 17 Sep 2022 18:53:17 +0000
Subject: [PATCH 636/767] Translated using Weblate (Spanish)

Currently translated at 90.9% (1018 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/es/
---
 config/locales/es.yml | 132 +++++++++++++++++++++++++++++++-----------
 1 file changed, 98 insertions(+), 34 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5cf075af..326a9bb3 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2,8 +2,8 @@ es:
   activerecord:
     attributes:
       note:
-        created_at: Creado el
-        updated_at: actualizado a las
+        created_at: Creado en
+        updated_at: Actualizado en
       preference:
         date_format: Formato de fecha
         due_style: Debido al estilo
@@ -93,14 +93,15 @@ es:
         body: 'Hubo problemas con los campos siguientes:'
         header:
           one: Un error ha impedido que se guarde este %{model}
-          other: '%{count} errores han impedido que se guarden este %{model}'
+          many: '%{count} errores han impedido que se guarden este %{model}'
+          other: ''
   common:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tarea
+      one: tareas
+      many: tarea
       other: tareas
-      zero: tareas
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -113,7 +114,8 @@ es:
     create: Crear
     days_midsentence:
       one: día
-      other: días
+      many: días
+      other: ''
     deferred: pospuestas
     description: Descripción
     drag_handle: ARRASTRAR
@@ -132,9 +134,9 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 1 nota
-      other: "%{count} notas"
-      zero: 0 notas
+      one: 0 notas
+      many: 1 nota
+      other: '%{count} notas'
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -313,40 +315,49 @@ es:
     distance_in_words:
       about_x_hours:
         one: alrededor de 1 hora
-        other: Acerca de %{count} horas
+        many: Acerca de %{count} horas
+        other: ''
       about_x_months:
         one: alrededor de 1 mes
-        other: Acerca de %{count} meses
+        many: Acerca de %{count} meses
+        other: ''
       about_x_years:
         one: alrededor de 1 año
-        other: Acerca de %{count} años
+        many: Acerca de %{count} años
+        other: ''
       almost_x_years:
         one: casi 1 año
-        other: Casi %{count} años
+        many: Casi %{count} años
+        other: ''
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de un minuto
+        one: menos de 1 minuto
+        many: menos de un minuto
         other: menos de %{count} minutos
-        zero: menos de 1 minuto
       less_than_x_seconds:
-        one: menos de 1 segundo
-        other: menos de %{count} segundos
-        zero: menos de 1 segundo
+        one: menos de %{count} segundo
+        many: más de %{count} segundos
+        other: ''
       over_x_years:
         one: más de un año
-        other: en %{count} años
+        many: en %{count} años
+        other: ''
       x_days:
         one: 1 día
-        other: '%{count} días'
+        many: '%{count} días'
+        other: ''
       x_minutes:
         one: 1 minuto
-        other: '%{count} minutos'
+        many: '%{count} minutos'
+        other: ''
       x_months:
         one: 1 mes
-        other: '%{count} meses'
+        many: '%{count} meses'
+        other: ''
       x_seconds:
         one: Un segundo
-        other: '%{count} segundos'
+        many: '%{count} segundos'
+        other: ''
     prompts:
       day: Día
       hour: Hora
@@ -426,6 +437,52 @@ es:
       message_gateway: Integre Seguimientos con un servidor de correo para ser capaz
         de enviar una acción a través del correo a los Seguimientos
       mailgun: Enviar correos a los Seguimientos con Mailgun
+      automatic_email: Envíese automáticamente por correo electrónico las próximas
+        acciones
+    message_gateway:
+      one_user_configuration: 'También puede enviar todos los correos electrónicos
+        a un usuario específico de Tracks. Configure mail_dispatch en site.yml a %{single_user_value}
+        y pase el inicio de sesión del usuario en el comando de canalización: %{code}'
+      instructions:
+        '1': Vaya a %{preferences_link} y configure su "%{sms_email_name}" y "%{sms_context_name}"
+          para todos los enviados por correo electrónico (que podrían provenir de
+          un mensaje SMS)
+        '3': ¡Envíe un correo electrónico a su dirección recién configurada!
+        '2': En sendmail/qmail/postfix/whatever, configure un alias de dirección de
+          correo electrónico para enviar mensajes a %{command}
+      description: 'Si Tracks se ejecuta en el mismo servidor que tu correo, puedes
+        utilizar el gestor de correo integrado en Tracks. Pasos para configurarlo:'
+      rich_api_tip: También puedes utilizar la Rich Todo API para enviar tareas como
+        "lavar la ropa en casa" o "llamar a Bill > proyecto X". El asunto del mensaje
+        rellenará la descripción, el contexto y el proyecto, mientras que el cuerpo
+        rellenará la nota de la tarea.
+      configuration: Es posible que deba configurar su %{site_yml} para decirle a
+        la puerta de enlace de mensajes que mire el campo %{to_name} o el campo %{from_name}
+        para buscar al usuario de Tracks desde la dirección de correo electrónico
+        en ese campo.
+    mailgun:
+      description: Si desea enviar tareas por correo electrónico a Tracks, pero no
+        puede ejecutar un servidor de correo en el mismo host, puede utilizar la compatibilidad
+        con %{mailgun_link} integrada en Tracks.
+    developer_documentation_link: Información para desarrolladores de Tracks
+    cron_email_subject: Realiza un seguimiento de las acciones que vencen en los próximos
+      7 días
+    title: Integraciones
+    intro: Tracks se puede integrar con otras herramientas... lo que sea necesario
+      para ayudarle a hacer las cosas! Esta página tiene información sobre cómo configurar
+      algunos de estos. No todas ellas son aplicables a todas las plataformas, y algunas
+      requieren más conocimientos técnicos que otras. Véase también %{documentation_link}
+    cron_2: Por supuesto, puede utilizar otro texto %{feeds_link} - ¿Por qué no enviar
+      una lista de las próximas acciones delproyecto en particular a un grupo de colegas
+      que están trabajando en el proyecto?
+    feeds_link_text: feeds proporcionados por Tracks
+    contents_header: 'Contenido:'
+    add_your_own: ¿Tienes uno propio para agregar? %{tell_us_link} y podemos incluirlo
+      en esta página en futuras versiones de Tracks.
+    tell_us_link_text: Cuéntanos sobre ello en nuestra cola de problemas
+    cron_1: Si ingresa la siguiente entrada a su crontab, recibirá un correo electrónico
+      todos los días alrededor de las 5 AM con una lista de las próximas acciones
+      que deben realizarse dentro de los próximos 7 días.
   help:
     title: Help
     usage: ''
@@ -436,7 +493,7 @@ es:
     contribute_link_text: project website
     mailing_list_link_text: Mailing list
     irc_bullet: '%{irc_link} (también disponible en %{matrix_link})'
-    irc_link_text: 'IRC channel #Tracks@FreeNode'
+    irc_link_text: 'Canal IRC #Tracks@Libera'
     matrix_link_text: Matriz
   layouts:
     mobile_navigation:
@@ -597,7 +654,8 @@ es:
         units:
           byte:
             one: Byte
-            other: Bytes
+            many: Bytes
+            other: ''
           gb: GB
           kb: KB
           mb: MB
@@ -953,7 +1011,8 @@ es:
     completed_actions_with: Acciones completadas con la lengüeta «%{tag_name}»
     completed_in_archive:
       one: There is one completed action in the archive.
-      other: There are %{count} completed actions in the archive.
+      many: There are %{count} completed actions in the archive.
+      other: ''
     completed_last_day: Completed in the last 24 hours
     completed_last_x_days: Completed in last %{count} days
     completed_recurrence_completed: There is no next action after the recurring action
@@ -973,7 +1032,8 @@ es:
       due date before deferring.
     defer_x_days:
       one: Defer one day
-      other: Defer %{count} days
+      many: Defer %{count} days
+      other: ''
     deferred_actions_with: Deferred actions with the tag '%{tag_name}'
     deferred_pending_actions: Deferred/pending actions
     deferred_tasks_title: TRACKS::Recordatorio
@@ -1012,7 +1072,8 @@ es:
       due: 'Vence: %{date}'
     has_x_pending:
       one: Tiene una tarea pendiente
-      other: Tiene %{count} tareas pendientes
+      many: Tiene %{count} tareas pendientes
+      other: ''
     hidden_actions: Tareas ocultas
     in_hidden_state: en estado oculto
     in_pending_state: en estado pendiente
@@ -1179,8 +1240,9 @@ es:
     task_list_title: TRACKS::List etiquetadas
     tickler_items_due:
       one: Un elemento de tiquet ahora está vencido - recargue la página para verlo.
-      other: '%{count} elementos de ticket ahora están vencidos - recargue la página
+      many: '%{count} elementos de ticket ahora están vencidos - recargue la página
         para verlos.'
+      other: ''
     to_tickler: al recordatorio
     unable_to_add_dependency: Es imposible añadir dependencia
     unresolved_dependency: ''
@@ -1191,7 +1253,7 @@ es:
     auth_change_submit: Modifica el tipo de autenticación
     auth_type_update_error: 'Hubo un problema actualizando su tipo de autenticación:
       %{error_messages}'
-    auth_type_updated: Tipo autenticador actualizado
+    auth_type_updated: Tipo autenticador actualizado.
     change_auth_type_title: TRACKS::Change tipo de autenticación
     change_authentication_type: Cambia el tipo de autenticación
     change_password_prompt: Introduzca su contraseña nueva dentro de los campos debajo
@@ -1246,13 +1308,13 @@ es:
       multi_page_html: Representando %{model} %{from} - %{to} de
         %{count} en el total
       single_page:
-        one: Viendo del 1 %{model}
+        one: No %{model} encontrado
+        many: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
       single_page_html:
-        one: Viendo del 1 %{model}
+        one: No %{model} encontrado
+        many: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
     page_gap: "…"
     previous_label: "« Anterior"
   rest_help:
@@ -1260,3 +1322,5 @@ es:
       title: Autenticación
     activeresource:
       ror_link_text: Ruby on Rails
+    notes:
+      curl_description: Todos los ejemplos utilizan %{curl}.

From 98e57367e9d627f443e986c71e630faa479a00a8 Mon Sep 17 00:00:00 2001
From: gallegonovato 
Date: Sat, 1 Oct 2022 14:08:07 +0000
Subject: [PATCH 637/767] Translated using Weblate (Spanish)

Currently translated at 91.0% (1019 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/es/
---
 config/locales/es.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 326a9bb3..d576e9e2 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -439,6 +439,7 @@ es:
       mailgun: Enviar correos a los Seguimientos con Mailgun
       automatic_email: Envíese automáticamente por correo electrónico las próximas
         acciones
+      email_rich: Formato del correo electrónico de Rich Todo Message
     message_gateway:
       one_user_configuration: 'También puede enviar todos los correos electrónicos
         a un usuario específico de Tracks. Configure mail_dispatch en site.yml a %{single_user_value}

From 10ad112b7074940fa1b9265d7c83af3dee1c874e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20H=C3=BCseyin=20Ekseli?= 
Date: Fri, 9 Dec 2022 09:30:22 +0000
Subject: [PATCH 638/767] Translated using Weblate (Turkish)

Currently translated at 30.1% (337 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/tr/
---
 config/locales/tr.yml | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index c7e5b762..7b9613e5 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -21,9 +21,9 @@ tr:
       paste_field: 'İçe aktarılan YAML dosyasının içeriğini aşağıdaki metin kutucuğuna
         yapıştır:'
       warning: Dikkat
-      yaml_warning: '%{warning}: YAML dosyası dışa aktarılmadan önce mevcut bütün bilgileriniz
-        kaybolacak. Herhangi bir sorun yaşama ihtimalinize karşılık, eğer veri tabanına
-        şu anda erişiminiz var ise yedeklemenizi öneririz.'
+      yaml_warning: '%{warning}: YAML dosyası dışa aktarılmadan önce mevcut bütün
+        bilgileriniz kaybolacak. Herhangi bir sorun yaşama ihtimalinize karşılık,
+        eğer veri tabanına şu anda erişiminiz var ise yedeklemenizi öneririz.'
     export:
       page_title: Tracks::Export
       title: Dışa aktarılıyor
@@ -39,8 +39,8 @@ tr:
       download_link: İndirme bağlantısı
       yaml_link_title: YAML dosyası
       xml_description: '%{xml}: Veri aktarımı ve düzenleme için en iyisidir'
-      yaml_experimental: Lütfen YAML dosyalarının deneysel olarak desteklendiğini göz
-        önünde bulundurunuz. Önemli verileri yedeklerken dikkatli olunuz.
+      yaml_experimental: Lütfen YAML dosyalarının deneysel olarak desteklendiğini
+        göz önünde bulundurunuz. Önemli verileri yedeklerken dikkatli olunuz.
       csv_description: '%{csv}: İş tablosuna veya veri analizi yazılımlarına aktarmak
         için en iyisidir'
       xml_link_description: XML dosyası bütün eylemlerinizi, içeriklerinizi, projelerinizi,
@@ -80,7 +80,8 @@ tr:
     context_hide: Font sayfasında gizle?
     context_deleted: Silinen içerik '%{name}'
     completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan eylemler
-    all_completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan bütün eylemler
+    all_completed_tasks_title: TRACKS::şuradan '%{context_name}' tamamlanan bütün
+      eylemler
     add_context: İçerik ekle
   common:
     wiki: Wiki
@@ -97,8 +98,8 @@ tr:
       by_task_count_title: Görev sayısına göre sırala
       by_task_count: Görev sayısına göre
       alphabetically_title: Projeleri alfabetik olarak sırala
-      alphabetically_confirm: Bu projeleri alfabetik olarak sıralamak istediğinize emin
-        misiniz? Bu işlem mevcut sıralamayı iptal edecektir.
+      alphabetically_confirm: Bu projeleri alfabetik olarak sıralamak istediğinize
+        emin misiniz? Bu işlem mevcut sıralamayı iptal edecektir.
       alphabetically: Alfabetik sırayla
     show_all: Hepsini göster
     server_error: Sunucuda bir hata meydana geldi.
@@ -149,8 +150,8 @@ tr:
       one: Not yok
       other: 1 not var
     actions_midsentence:
-      one: Eylem
-      other: Eylemler
+      one: eylem
+      other: eylemler
   activerecord:
     errors:
       template:
@@ -172,7 +173,8 @@ tr:
         taken: zaten alınmış
         restrict_dependent_destroy:
           has_many: Bu kayda bağlı bir dosya bulunduğu için kayıt silinemez %{record}
-          has_one: Bu kayda bağlı farklı bir dosya bulunduğu için kayıt silinemez %{record}
+          has_one: Bu kayda bağlı farklı bir dosya bulunduğu için kayıt silinemez
+            %{record}
         record_invalid: 'Doğrulama başarısız: %{errors}'
         odd: tek sayı olmalıdır
         not_a_number: rakam değildir
@@ -380,10 +382,10 @@ tr:
     ical_feed: iCal akış
     last_fixed_number: Son %{number} eylem/ler
     legend: 'Semboller:'
-    notice_incomplete_only: "Not: Akış, aksi işaretlenmedikçe sadece tamamlanmamış eylemleri\
-      \ gösterir. Bu iCal akışları todo listesine eklenebilir. Eğer bitimi yaklaşan\
-      \ todo'ları takvimde görüntülemek istiyorsanız, takvim sayfasından iCal akışını\
-      \ kullanın"
+    notice_incomplete_only: "Not: Akış, aksi işaretlenmedikçe sadece tamamlanmamış\
+      \ eylemleri gösterir. Bu iCal akışları todo listesine eklenebilir. Eğer bitimi\
+      \ yaklaşan todo'ları takvimde görüntülemek istiyorsanız, takvim sayfasından\
+      \ iCal akışını kullanın"
     plain_text_feed: Düz Yazı Akışı
     project_centric: Belirli bir projedeki tamamlanmamış eylemler akışı
     project_needed: Akış talep etmeden önce en az bir proje olmalı
@@ -401,9 +403,9 @@ tr:
     add_your_own: Eklemek istediğiniz araç mı var? Tracks'ın gelecek sürümlerine ekleyebilmemiz
       için bize gönderin %{tell_us_link}.
     intro: 'Tracks işinize yarayabilecek diğer araçlarla entegre edilebilir! Bu sayfa
-      bazılarını entegre etmeye yönelik bilgi içerir. Her platforma uygulanabilir olmayabilirler
-      ve bazıları diğerlerine kıyasla daha fazla teknik bilgi gerektirebilir. Ek bilgi
-      için: %{documentation_link}'
+      bazılarını entegre etmeye yönelik bilgi içerir. Her platforma uygulanabilir
+      olmayabilirler ve bazıları diğerlerine kıyasla daha fazla teknik bilgi gerektirebilir.
+      Ek bilgi için: %{documentation_link}'
     developer_documentation_link: Tracks için geliştirici dokümantasyonu
     contents_header: 'İçerikler:'
     tell_us_link_text: Bunun hakkında bize görüş bildirin
@@ -415,8 +417,8 @@ tr:
       bitimi yaklaşan eylemlerle ilgili bir e-posta alacaksınız.
     message_gateway:
       rich_api_tip: Mesaj içeriği tanım, içerik ve proje kısmına, not ise gövde metnine
-        yazarak "çamaşırları yıka @ Ev" veya "Mehmet'i Ara > x projesi" ve benzeri türden
-        görevler oluşturmak için Rich Todo API kullanabilirsiniz.
+        yazarak "çamaşırları yıka @ Ev" veya "Mehmet'i Ara > x projesi" ve benzeri
+        türden görevler oluşturmak için Rich Todo API kullanabilirsiniz.
   footer:
     send_feedback: Geri bildirim
     version: 'Tracks %{version} (%{revision_with_date})'

From d26275c5e963e6ead91f1653eb33ce56ec0a6a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=83=D0=BD=D0=BE=D0=B2?= 
Date: Wed, 18 Jan 2023 20:07:10 +0000
Subject: [PATCH 639/767] Translated using Weblate (Russian)

Currently translated at 97.0% (1086 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/ru/
---
 config/locales/ru.yml | 52 ++++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ef7e3bff..2622d87e 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -103,7 +103,6 @@ ru:
       one: действий
       few: действие
       many: действия
-      other: действия
     add: Добавить
     ajaxError: От сервера была получена ошибка
     back: Назад
@@ -115,9 +114,9 @@ ru:
     contribute: Сотрудничество
     create: Создать
     days_midsentence:
-      one: дней
-      few: день
-      many: дня
+      one: день
+      few: дня
+      many: дней
     deferred: отложенные
     description: Описание
     drag_handle: ТАЩИТЬ
@@ -136,10 +135,9 @@ ru:
     none: Не задано
     not_available_abbr: н/д
     note:
-      few: "%{count} записи"
-      one: 1 запись
-      other: '%{count} записи'
-      zero: нет записей
+      one: нет записей
+      few: 1 запись
+      many: '%{count} записи'
     notes: Заметки
     numbered_step: Шаг %{number}
     ok: ОК
@@ -221,6 +219,7 @@ ru:
           нет доступа к каталогу загрузок? %{e}
         invalid_csv: 'Недопустимый CSV: не удаётся прочитать заголовки: %{e}'
         invalid_destination: 'Неверное место назначения импорта: %{e}'
+        no_context: Контекст по умолчанию не найден
       yaml_disabled: Загрузка YAML отключена
       todos_count: '%{count} задач импортировано'
       projects_count: '%{count} проектов импортировано'
@@ -474,12 +473,15 @@ ru:
           для месяца и дня или шестизначной для года, месяца и дня)
         project: Проект для внесения в задачу
         context: Контекст для внесения в задачу
+        tickler_date: Дата напоминания для задачи (может быть 2 цифры для дня, 4 цифры
+          для месяца-дня или 6 цифр для года-месяца-дня)
       fields_instruction: Все специальные символы являются необязательными, а текст
         до первого символа (или конца строки) используется в качестве описания задачи
       meaning_title: Значение
       symbol_title: Символ
       fields_title: 'Поля:'
-      description: 'Для обоих описанных методов используется следующий формат:'
+      description: 'Для обоих описанных методов в теме сообщения можно использовать
+        следующий формат для добавления метаданных:'
     message_gateway:
       instructions:
         '3': На вашу свежеустановленную почту отправлено письмо!
@@ -1082,7 +1084,6 @@ ru:
       one: Отложить на 1 день
       few: Отложить на %{count} дня
       many: Отложить на %{count} дней
-      other: Отложить на %{count} дней
     deferred_actions_with: Отложенные действия с меткой '%{tag_name}'
     deferred_pending_actions: Отложенные/ожидающие действия
     deferred_tasks_title: TRACKS::Отложенные
@@ -1360,13 +1361,13 @@ ru:
       multi_page: Отображено %{model} %{from} - %{to} из %{count}
       multi_page_html: Отображено %{model} %{from} - %{to} из %{count}
       single_page:
-        one: Отображён 1 %{model}
-        other: Отображены все %{count} %{model}
-        zero: '%{model} не найден'
+        one: '%{model} не найден'
+        few: Отображён 1 %{model}
+        many: Отображены все %{count} %{model}
       single_page_html:
-        one: Отображен 1 %{model}
-        other: Отображены все %{count} %{model}
-        zero: '%{model} не найден'
+        one: '%{model} не найден'
+        few: Отображен 1 %{model}
+        many: Отображены все %{count} %{model}
     page_gap: "…"
     previous_label: "← Пред"
   rest_help:
@@ -1378,8 +1379,27 @@ ru:
         другими приложениями. На этой странице представлена документация по нашему
         REST API.
       title: Вступление
+      content_3: API — это служба %{restful_link}. Все данные доступны через API как
+        ресурс, на который можно сослаться по уникальному идентификатору. Он отвечает
+        на ряд методов HTTP, в частности GET, PUT, POST и UPDATE, а все ответы от
+        API представлены в простом XML формате, в кодировке UTF-8.
+      restful_link_text: RESTful
     curl_link_text: cURL
     id: ID
     title: Документация REST API для разаработчиков
+    auth:
+      basic_auth_link_text: Базовая HTTP-аутентификация
+      title: Аутентификация
+      content: Аутентификация обрабатывается с помощью %{auth_link}. Ваше имя пользователя
+        и пароль Tracks используются в качестве учетных данных аутентификации через
+        API. Обратите внимание, что при обычной HTTP-аутентификации ваш пароль отправляется
+        в виде открытого текста. Если вам нужно более безопасное решение для аутентификации,
+        вам следует настроить веб-сервер для запуска Tracks по HTTPS.
+    retrieve:
+      title: Получение данных из API
+      content: 'Чтобы получить данные, вам нужно всего лишь выполнить HTTP GET запрос
+        для идентификатора ресурса. Например, если вы хотите получить все контексты
+        с %{curl_link}:'
+      single_context: 'Получение единого контекста:'
   auth_type:
     database: База данных

From 8ed97a511dc1b9711093b015f6cd428993789768 Mon Sep 17 00:00:00 2001
From: Ranforingus 
Date: Wed, 22 Nov 2023 16:50:16 +0000
Subject: [PATCH 640/767] Translated using Weblate (Dutch)

Currently translated at 88.2% (988 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/nl/
---
 config/locales/nl.yml | 319 ++++++++++++++++++++++++++----------------
 1 file changed, 202 insertions(+), 117 deletions(-)

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b244660e..739fa7a3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1,4 +1,3 @@
----
 nl:
   activerecord:
     attributes:
@@ -70,8 +69,8 @@ nl:
         odd: moet oneven zijn
         record_invalid: 'Validatie mislukt: %{errors}'
         restrict_dependent_destroy:
-          many: Kan record niet verwijderen omdat afhankelijke %{record} bestaan
           one: Kan record niet verwijderen omdat een afhankelijk %{record} bestaat
+          other: Kan record niet verwijderen omdat afhankelijke %{record} bestaan
         taken: is al gepakt
         too_long: is te lang (maximum is %{count} karakters)
         too_short: is te kort (minimum is %{count} karakters)
@@ -87,14 +86,13 @@ 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
     actions_midsentence:
-      one: actie
-      other: acties
-      zero: acties
+      one: acties
+      other: actie
     add: Toevoegen
     ajaxError: Er is een fout opgetreden bij het ophalen van gegevens van de server
     back: Terug
@@ -106,9 +104,8 @@ nl:
     contribute: Bijdragen
     create: Maken
     days_midsentence:
-      one: dag
-      other: dagen
-      zero: dagen
+      one: dagen
+      other: dag
     deferred: uitgestelde
     description: Beschrijving
     drag_handle: SLEEP
@@ -127,9 +124,8 @@ nl:
     none: Geen
     not_available_abbr: n/b
     note:
-      one: 1 notitie
-      other: "%{count} notities"
-      zero: geen notities
+      one: geen notities
+      other: 1 notitie
     notes: Notities
     numbered_step: Stap %{number}
     ok: Ok
@@ -145,11 +141,13 @@ nl:
     show_all: Toon alle
     sort:
       alphabetically: Alfabetisch
-      alphabetically_confirm: Weet u zeker dat u deze projecten alfabetisch wilt sorteren? Dat zal de huidige sorteervolgorde aanpassen.
+      alphabetically_confirm: Weet u zeker dat u deze projecten alfabetisch wilt sorteren?
+        Dat zal de huidige sorteervolgorde aanpassen.
       alphabetically_title: Sorteer projecten alfabetisch
       by_task_count: Op aantal acties
       by_task_count_title: Sorteer op aantal acties
-      by_task_count_title_confirm: Weet u zeker dat u deze op aantal acties wilt sorteren? Dat zal de huidige sorteervolgorde aanpassen.
+      by_task_count_title_confirm: Weet u zeker dat u deze op aantal acties wilt sorteren?
+        Dat zal de huidige sorteervolgorde aanpassen.
       sort: Sorteer
     third: Derde
     todo: actie
@@ -167,7 +165,8 @@ nl:
     context_name: Context naam
     context_state: Status
     delete_context: Verwijder context
-    delete_context_confirmation: Weet u zeker dat u de context '%{name}' wilt verwijderen? Merk op dat dit ook alle (herhalende) acties in deze context zal verwijderen!
+    delete_context_confirmation: Weet u zeker dat u de context '%{name}' wilt verwijderen?
+      Merk op dat dit ook alle (herhalende) acties in deze context zal verwijderen!
     delete_context_title: Verwijder context
     edit_context: Bewerk context
     hidden_contexts: Verborgen contexten
@@ -267,28 +266,26 @@ nl:
         other: bijna %{count} jaren
       half_a_minute: halve minuut
       less_than_x_minutes:
-        one: minder dan een minuut
-        other: minder dan %{count} minuten
-        zero: minder dan 1 minuut
+        one: minder dan 1 minuut
+        other: minder dan een minuut
       less_than_x_seconds:
         one: minder dan 1 seconde
-        other: minder dan %{count} seconden
-        zero: minder dan 1 seconde
+        other: minder dan 1 seconde
       over_x_years:
         one: over 1 jaar
         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
@@ -321,7 +318,8 @@ 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)
-    user_unauthorized: '401 Unauthorized: Alleen administratieve gebruikers mogen deze functie gebruiken.'
+    user_unauthorized: '401 Unauthorized: Alleen administratieve gebruikers mogen
+      deze functie gebruiken.'
   feedlist:
     actions_completed_last_week: Acties afgerond in de afgelopen 7 dagen
     actions_due_next_week: Acties die binnen 7 dagen afgerond moeten
@@ -334,14 +332,17 @@ nl:
     choose_context: Kies de context waar je een feed van wilt
     choose_project: Kies het project waar je een feed van wilt
     context_centric_actions: Feeds voor onafgeronde acties in een specifieke context
-    context_needed: Er moet eerst ten minste één context zijn voor je een feed kan opvragen
+    context_needed: Er moet eerst ten minste één context zijn voor je een feed kan
+      opvragen
     ical_feed: iCal feed
     last_fixed_number: Laatste %{number} acties
     legend: Legenda
-    notice_incomplete_only: 'Merk op: alle feeds laten alleen acties zien die niet afgerond zijn, tenzij anders vermeld.'
+    notice_incomplete_only: 'Merk op: alle feeds laten alleen acties zien die niet
+      afgerond zijn, tenzij anders vermeld.'
     plain_text_feed: Reguliere tekst feed
     project_centric: Feeds voor onafgeronde acties in een specifiek project
-    project_needed: Er moet ten minste één project zijn voor een feed opgevraagd kan worden
+    project_needed: Er moet ten minste één project zijn voor een feed opgevraagd kan
+      worden
     projects_and_actions: Actieve projecten met hun acties
     rss_feed: RSS Feed
     select_feed_for_context: Kies de feed voor deze context
@@ -359,52 +360,83 @@ nl:
   integrations:
     sections:
       automatic_email: Email jezelf automatisch de acties met een aflopende deadline
-      message_gateway: Integreer Tracks met een email server om een actie via email naar Tracks te sturen
+      message_gateway: Integreer Tracks met een email server om een actie via email
+        naar Tracks te sturen
       mailgun: Send emails to Tracks with Mailgun
       email_rich: Rich Todo Message email format
     opensearch_description: Zoek in Tracks
     title: Integratie
-    intro: "Tracks kan met een aantal tools worden geïntegreerd... Alles om je te helpen om dingen gedaan te krijgen! Deze pagina heeft informatie over het tot stand brengen van sommige integratievormen. Deze voorbeelden zijn niet altijd voor alle platformen van toepassing en sommige voorbeelden vragen meer technische kennis dan anderen Zie ook %{documentation_link}."
-    developer_documentation_link: "de documentatie voor ontwikkelaars met Tracks' REST API"
+    intro: "Tracks kan met een aantal tools worden geïntegreerd... Alles om je te
+      helpen om dingen gedaan te krijgen! Deze pagina heeft informatie over het tot
+      stand brengen van sommige integratievormen. Deze voorbeelden zijn niet altijd
+      voor alle platformen van toepassing en sommige voorbeelden vragen meer technische
+      kennis dan anderen Zie ook %{documentation_link}."
+    developer_documentation_link: "de documentatie voor ontwikkelaars met Tracks'
+      REST API"
     contents_header: "Inhoud:"
-    add_your_own: Heb je een tip om hier toe te voegen? %{tell_us_link} en misschien voegen we jouw tip toe op deze pagina in een toekomstige versie van Tracks.
+    add_your_own: Heb je een tip om hier toe te voegen? %{tell_us_link} en misschien
+      voegen we jouw tip toe op deze pagina in een toekomstige versie van Tracks.
     tell_us_link_text: Vertel ons er over in onze issue queue
-    cron_1: Als je de volgende regel toevoegd aan jouw crontab, dat ontvang je een e-mail op elke dag rond 05:00 met een lijst met acties waarvan de deadline afloopt binnen de komende 7 dagen.
-    cron_2: "Uiteraard kan je ook een andere %{feeds_link} – bijvoorbeeld een email met een lijst van acties voor een specifiek project naar een groep collega's die werken aan dat project?"
+    cron_1: Als je de volgende regel toevoegd aan jouw crontab, dat ontvang je een
+      e-mail op elke dag rond 05:00 met een lijst met acties waarvan de deadline afloopt
+      binnen de komende 7 dagen.
+    cron_2: "Uiteraard kan je ook een andere %{feeds_link} – bijvoorbeeld een email
+      met een lijst van acties voor een specifiek project naar een groep collega's
+      die werken aan dat project?"
     cron_email_subject: Tracks actions due in the next 7 days
     feeds_link_text: text feed gebruiken die Tracks biedt
     message_gateway:
-      description: 'Als Tracks draait op dezelfde server als jouw mailserver, dan kan je de geïntegreerde mail handler gebruiken van Tracks. Om dit in te stellen:'
-      rich_api_tip: 'Je kan ook de Rich Todo API gebruiken om acties te maken zoals "do laundry @ Home" of "Call Bill > project X". Het onderwerp van het bericht zal de bijschrijving van de actie vullen, de context, en het project, terwijl de body van het bericht de notities van de actie zal vullen.'
-      configuration: "Het kan nodig zijn om jouw %{site_yml} te configureren om de message gateway te laten kijken naar het %{to_name} veld of het %{from_name} veld om de Tracks-gebruiker op te zoeken met het emailadres uit dat veld."
-      one_user_configuration: "Je kan ook alle email naar een specifieke Tracks gebruiker sturen. Stel mail_dispatch in site.yml in op %{single_user_value} en geeft de login van de gebruiker door: %{code}"
+      description: 'Als Tracks draait op dezelfde server als jouw mailserver, dan
+        kan je de geïntegreerde mail handler gebruiken van Tracks. Om dit in te stellen:'
+      rich_api_tip: 'Je kan ook de Rich Todo API gebruiken om acties te maken zoals
+        "do laundry @ Home" of "Call Bill > project X". Het onderwerp van het bericht
+        zal de bijschrijving van de actie vullen, de context, en het project, terwijl
+        de body van het bericht de notities van de actie zal vullen.'
+      configuration: "Het kan nodig zijn om jouw %{site_yml} te configureren om de
+        message gateway te laten kijken naar het %{to_name} veld of het %{from_name}
+        veld om de Tracks-gebruiker op te zoeken met het emailadres uit dat veld."
+      one_user_configuration: "Je kan ook alle email naar een specifieke Tracks gebruiker
+        sturen. Stel mail_dispatch in site.yml in op %{single_user_value} en geeft
+        de login van de gebruiker door: %{code}"
       instructions:
-        '1': 'Ga naar %{preferences_link} en stel in "%{sms_email_name}" en "%{sms_context_name}" voor acties die verzonden zijn via email (die bijv. komen via een SMS message)'
-        '2': In sendmail/qmail/postfix/whatever, stel een email address alias in om berichten door te sturen naar %{command}
+        '1': 'Ga naar %{preferences_link} en stel in "%{sms_email_name}" en "%{sms_context_name}"
+          voor acties die verzonden zijn via email (die bijv. komen via een SMS message)'
+        '2': In sendmail/qmail/postfix/whatever, stel een email address alias in om
+          berichten door te sturen naar %{command}
         '3': Verstuur een email naar het net geconfigureerde e-mail adres!
     mailgun:
-      description: If you want to email tasks to Tracks, but cannot run a mailserver on the same host, you could use the %{mailgun_link} support built in to Tracks.
-      conditions: For this to work your Tracks server will need to be reachable from the internet, so that Mailgun can POST data to it.
-      gateway_instructions: All the comments about the email format from the section above apply to the Mailgun handling, as the data is processed the same way
+      description: If you want to email tasks to Tracks, but cannot run a mailserver
+        on the same host, you could use the %{mailgun_link} support built in to Tracks.
+      conditions: For this to work your Tracks server will need to be reachable from
+        the internet, so that Mailgun can POST data to it.
+      gateway_instructions: All the comments about the email format from the section
+        above apply to the Mailgun handling, as the data is processed the same way
       instructions:
         '1': Go to %{mailgun_link} and register for a free account.
         '2': "Go to 'Routes' in the Mailgun control panel, and add a new route:"
         2a: "'Filter expression' should be set to 'catch_all()'"
-        2b: "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\")'"
-        '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.'
+        2b: "'Action' should be 'forward(\"http://mytracksserver.example.com/mailgun/mime\"\
+          )'"
+        '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address
+          (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.'
         '4': 'Select a default context for emails to be put in with "%{sms_context_name"'
         '5': "Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml'"
-        '6': "Update the mailmap in 'site.yml' to define which senders can send emails to which incoming addresses. For example, to send emails from your work and home email accounts to your tracks Mailgun route, set it up like this: %{code}"
+        '6': "Update the mailmap in 'site.yml' to define which senders can send emails
+          to which incoming addresses. For example, to send emails from your work
+          and home email accounts to your tracks Mailgun route, set it up like this:
+          %{code}"
     email_rich:
       description: "For both of the above methods, the follow format can be used:"
       fields_title: "The fields are:"
       symbol_title: Symbol
       meaning_title: Meaning
-      fields_instruction: All symbols are optional, and text up to the first symbol (or end of string) is used as the description of the todo
+      fields_instruction: All symbols are optional, and text up to the first symbol
+        (or end of string) is used as the description of the todo
       field_descriptions:
         context: The context to place the Todo in
         project: The project to place the Todo in
-        due_date: The due date for the Todo (may be 2 digits for day, 4 digits for month-day, or 6 digits for year-month-day)
+        due_date: The due date for the Todo (may be 2 digits for day, 4 digits for
+          month-day, or 6 digits for year-month-day)
         tag: A tag to apply to the Todo – may be used multiple times
         star: Flag to star the Todo
     example_names:
@@ -416,11 +448,14 @@ nl:
         '2': tag2
   help:
     title: Help
-    usage: 'You can find information on the usage in the %{manual_link} in the project GitHub wiki.'
+    usage: 'You can find information on the usage in the %{manual_link} in the project
+      GitHub wiki.'
     manual_link_text: User manual
-    bugs: 'If you encounter a bug or have a feature request, please report it in the %{issue_link}.'
+    bugs: 'If you encounter a bug or have a feature request, please report it in the
+      %{issue_link}.'
     issue_link_text: issue queue
-    contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link} for further information. You can also come discuss with the community:'
+    contribute: 'We gladly welcome all contributions to Tracks. Check the %{contribute_link}
+      for further information. You can also come discuss with the community:'
     contribute_link_text: project website
     mailing_list_link_text: Mailing list
     irc_bullet: '%{irc_link} (also available in %{matrix_link})'
@@ -495,14 +530,16 @@ nl:
     cas_login: CAS Inloggen
     cas_no_user_found: Hallo,%{username}! Je hebt nog geen account op Tracks.
     cas_signup_link: Aanvragen account
-    cas_username_not_found: Sorry, geen gebruiker met die CAS gebruikersnaam bestaat (%{username})
+    cas_username_not_found: Sorry, geen gebruiker met die CAS gebruikersnaam bestaat
+      (%{username})
     log_in_again: opnieuw in te loggen.
     logged_out: Je bent afgemeld bij Tracks.
     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"
-    openid_identity_url_not_found: Sorry, geen gebruiker met die identiteit URL bestaat (%{identity_url})
+    openid_identity_url_not_found: Sorry, geen gebruiker met die identiteit URL bestaat
+      (%{identity_url})
     option_separator: of,
     please_login: Log in om Tracks te gebruiken
     session_time_out: Sessie is verlopen. Gelieve %{link}
@@ -530,8 +567,10 @@ nl:
     todo:
       error_date_must_be_future: moet een datum in de toekomst zijn
     user:
-      error_context_not_associated: Context %{context} niet geassocieerd met gebruikers %{user}.
-      error_project_not_associated: Project %{project} niet geassocieerd met gebruikers %{user}.
+      error_context_not_associated: Context %{context} niet geassocieerd met gebruikers
+        %{user}.
+      error_project_not_associated: Project %{project} niet geassocieerd met gebruikers
+        %{user}.
   notes:
     delete_confirmation: Weet u zeker dat u de notitie '%{id}' wilt verwijderen?
     delete_item_title: Verwijder item
@@ -540,7 +579,8 @@ nl:
     deleted_note: Verwijder notitie '%{id}'
     edit_item_title: Item bewerken
     in_project: 'In:'
-    no_notes_available: 'Momenteel zijn er geen notities: voeg notities toe aan projecten vanaf de individuele project pagina''s.'
+    no_notes_available: 'Momenteel zijn er geen notities: voeg notities toe aan projecten
+      vanaf de individuele project pagina''s.'
     note_header: Notitie %{id}
     note_link_title: Toon notitie %{id}
     note_location_link: 'In:'
@@ -551,17 +591,17 @@ nl:
       format:
         delimiter: "."
         format: "%u %n"
-        precision: 2
+        precision: '2'
         separator: ","
-        significant: false
-        strip_insignificant_zeros: false
+        significant: 'False'
+        strip_insignificant_zeros: 'False'
         unit: "€"
     format:
       delimiter: "."
-      precision: 3
+      precision: '3'
       separator: ","
-      significant: false
-      strip_insignificant_zeros: false
+      significant: 'False'
+      strip_insignificant_zeros: 'False'
     human:
       decimal_units:
         format: "%n %u"
@@ -574,9 +614,9 @@ nl:
           unit: "."
       format:
         delimiter: "."
-        precision: 1
-        significant: true
-        strip_insignificant_zeros: true
+        precision: '1'
+        significant: 'True'
+        strip_insignificant_zeros: 'True'
       storage_units:
         format: "%n %u"
         units:
@@ -602,14 +642,18 @@ nl:
     current_authentication_type: Uw authenticatietype is %{auth_type}
     edit_preferences: Voorkeuren bewerken
     generate_new_token: Genereer een nieuwe token
-    generate_new_token_confirm: Weet u dit zeker? Het genereren van een nieuw token zal de bestaande te vervangen en dit zal het extern gebruiken van de oude token laten mislukken.
+    generate_new_token_confirm: Weet u dit zeker? Het genereren van een nieuw token
+      zal de bestaande te vervangen en dit zal het extern gebruiken van de oude token
+      laten mislukken.
     is_false: Nee
     is_true: Ja
     open_id_url: Uw OpenID URL is
     page_title: 'TRACKS:: Voorkeuren'
     page_title_edit: 'TRACKS:: Voorkeuren bewerken'
     password_changed: Je wachtwoord is gewijzigd, meld je opnieuw aan.
-    remove_introduction: You can remove your user account here. Note that this is irreversible and will remove all your data! After removal you will be logged out.
+    remove_introduction: You can remove your user account here. Note that this is
+      irreversible and will remove all your data! After removal you will be logged
+      out.
     show_number_completed: Toon %{number} voltooide items
     sms_context_none: Geen
     staleness_starts_after: Markeren openstaande acties begint na %{days} dagen
@@ -629,7 +673,8 @@ nl:
     add_note: Een notitie toevoegen
     add_note_submit: Notitie toevoegen
     add_project: Voeg project toe
-    all_completed_tasks_title: TRACKS::Overzicht van all afgeronde acties in project '%{project_name}'
+    all_completed_tasks_title: TRACKS::Overzicht van all afgeronde acties in project
+      '%{project_name}'
     completed_actions: Completed actions
     completed_actions_empty: Completed actions empty
     completed_projects: Voltooide projecten
@@ -641,7 +686,8 @@ nl:
     deferred_actions: Deferred actions
     deferred_actions_empty: Deferred actions empty
     delete_project: Project verwijderen
-    delete_project_confirmation: Weet u zeker dat u wilt het project '%{name} wilt verwijderen?
+    delete_project_confirmation: Weet u zeker dat u wilt het project '%{name} wilt
+      verwijderen?
     delete_project_title: Verwijder het project
     edit_project_settings: Bewerk project instellingen
     edit_project_title: Bewerk project
@@ -749,11 +795,15 @@ nl:
     action_selection_title: 'TRACKS:: Actie selectie'
     actions: Acties
     actions_30days_title: Acties in de afgelopen 30 dagen
-    actions_actions_avg_created_30days: In de afgelopen 30 dagen heeft u gemiddeld %{count} acties gemaakt
+    actions_actions_avg_created_30days: In de afgelopen 30 dagen heeft u gemiddeld
+      %{count} acties gemaakt
     actions_avg_completed: en voltooide een gemiddelde van %{count} acties per maand.
-    actions_avg_completed_30days: en voltooide een gemiddelde van %{count} acties per dag.
-    actions_avg_completion_time: Van al uw afgeronde acties, de gemiddelde tijd dat dit in beslag nam is %{count} dagen.
-    actions_avg_created: In de afgelopen 12 maanden heeft u gemiddeld%{count} acties aangemaakt
+    actions_avg_completed_30days: en voltooide een gemiddelde van %{count} acties
+      per dag.
+    actions_avg_completion_time: Van al uw afgeronde acties, de gemiddelde tijd dat
+      dit in beslag nam is %{count} dagen.
+    actions_avg_created: In de afgelopen 12 maanden heeft u gemiddeld%{count} acties
+      aangemaakt
     actions_day_of_week_legend:
       day_of_week: Dag van de week
       number_of_actions: Aantal acties
@@ -762,7 +812,7 @@ nl:
       day_of_week: Dag van de week
       number_of_actions: Aantal acties
     actions_dow_30days_title: Dag van de week (laatste 30 dagen)
-    actions_further: en verder
+    actions_further: ' en verder'
     actions_last_year: Acties in de afgelopen jaren
     actions_last_year_legend:
       months_ago: Maanden geleden
@@ -773,10 +823,13 @@ nl:
     actions_selected_from_week: Gekozen acties van week
     click_to_return: Klik %{link} om terug te keren naar de statistieken pagina.
     click_to_return_link: hier
-    click_to_show_actions_from_week: Klik %{link} om de acties van week %{week} en verder te zien.
-    click_to_update_actions: Klik op een balk in de grafiek op de acties hieronder aan te passen.
+    click_to_show_actions_from_week: Klik %{link} om de acties van week %{week} en
+      verder te zien.
+    click_to_update_actions: Klik op een balk in de grafiek op de acties hieronder
+      aan te passen.
     contexts: Contexten
-    current_running_time_of_incomplete_visible_actions: Huidige looptijd van onvolledige zichtbare acties
+    current_running_time_of_incomplete_visible_actions: Huidige looptijd van onvolledige
+      zichtbare acties
     index_title: TRACKS::Statistiek
     labels:
       avg_completed: Gem afgerond
@@ -793,7 +846,8 @@ nl:
       number_of_days: Aantal dagen geleden
       percentage: Percentage
       running_time: Looptijd van een actie (weken)
-    more_stats_will_appear: Meer statistieken zullen hier verschijnen zodra u acties hebt toegevoegd.
+    more_stats_will_appear: Meer statistieken zullen hier verschijnen zodra u acties
+      hebt toegevoegd.
     no_actions_selected: Er zijn geen acties geselecteerd.
     no_tags_available: geen tags beschikbaar
     open_per_week: Active (zichtbare en verborgen) volgende acties per week
@@ -812,10 +866,13 @@ nl:
       percentage: Percentage
       weeks: Looptijd van een actie (weken). Klik op een balk voor meer info
     spread_of_actions_for_all_context: Verdeling van acties voor alle contexten
-    spread_of_running_actions_for_visible_contexts: Verdeling van actieve acties voor zichtbare contexten
-    tag_cloud_90days_description: Deze tag cloud bevat  tags van acties die zijn gemaakt of voltooid in de afgelopen 90 dagen.
+    spread_of_running_actions_for_visible_contexts: Verdeling van actieve acties voor
+      zichtbare contexten
+    tag_cloud_90days_description: Deze tag cloud bevat  tags van acties die zijn gemaakt
+      of voltooid in de afgelopen 90 dagen.
     tag_cloud_90days_title: Tag cloud met acties in afgelopen 90 dagen
-    tag_cloud_description: Deze tag cloud bevat tags van alle acties (afgerond, niet voltooid, zichtbaar en / of verborgen)
+    tag_cloud_description: Deze tag cloud bevat tags van alle acties (afgerond, niet
+      voltooid, zichtbaar en / of verborgen)
     tag_cloud_title: Tag Cloud voor alle acties
     tags: Tags
     time_of_day: Tijd van de dag (alle acties)
@@ -830,7 +887,8 @@ nl:
     top10_projects: Top 10 projecten
     top10_projects_30days: Top 10 project in de laatste 30 dagen
     top5_contexts: Top 5 contexten
-    top5_visible_contexts_with_incomplete_actions: Top 5 zichtbare contexten met onvolledige acties
+    top5_visible_contexts_with_incomplete_actions: Top 5 zichtbare contexten met onvolledige
+      acties
     totals: Totalen
     totals_action_count: u heeft een totaal van %{count} acties
     totals_actions_completed: "%{count} van deze zijn voltooid."
@@ -851,7 +909,7 @@ nl:
   support:
     array:
       last_word_connector: ", en"
-      two_words_connector: en
+      two_words_connector: ' en '
       words_connector: ","
     select:
       prompt: Selecteer
@@ -870,8 +928,10 @@ nl:
     action_deleted_error: Verwijderen van de actie is mislukt
     action_deleted_success: Actie succesvol verwijderd
     action_due_on: "(deadline actie op %{date})"
-    action_marked_complete: De actie '%{description}' werd gemarkeerd als %{completed}
-    action_marked_complete_error: De actie '%{description}' is niet gemarkeerd als %{completed} vanwege een fout op de server.
+    action_marked_complete: De actie '%{description}' werd gemarkeerd
+      als %{completed}
+    action_marked_complete_error: De actie '%{description}' is niet
+      gemarkeerd als %{completed} vanwege een fout op de server.
     action_saved: Actie opgeslagen
     action_saved_to_tickler: Actie opgeslagen in tickler
     actions:
@@ -909,7 +969,8 @@ nl:
       due_today: Deadline vandaag
       get_in_ical_format: Ontvang deze agenda in iCal-formaat
     calendar_page_title: TRACKS::Agenda
-    cannot_add_dependency_to_completed_todo: Kan deze actie niet als een afhankelijkheid van een voltooide actie toevoegen!
+    cannot_add_dependency_to_completed_todo: Kan deze actie niet als een afhankelijkheid
+      van een voltooide actie toevoegen!
     clear_due_date: Maak deadline leeg
     clear_show_from_date: Maak de datum Tonen Vanaf leeg
     completed: Afgerond
@@ -920,7 +981,8 @@ nl:
       other: Er zijn %{count} afgeronde acties in het archief.
     completed_last_day: Voltooid in de laatste 24 uur
     completed_last_x_days: Voltooid in de laatste %{count} dagen
-    completed_recurrence_completed: Er is geen actie na de terugkerende actie die u new verwijderd heeft. De herhaling is voltooid
+    completed_recurrence_completed: Er is geen actie na de terugkerende actie die
+      u new verwijderd heeft. De herhaling is voltooid
     completed_recurring: Afgesloten terugkerende todos
     completed_recurring_actions_title: TRACKS::Completed recurring actions
     completed_rest_of_month: Afgerond in de rest van deze maand
@@ -932,22 +994,25 @@ nl:
     confirm_delete: Weet u zeker dat u de actie '%{description}' wilt verwijderen?
     context_changed: Context veranderd in '%{name}'
     convert_to_project: Maak project
-    defer_date_after_due_date: Uitsteldatum is na de vervaldag. Gelieve vervaldag bewerken alvorens uitsteldatum aan te passen.
+    defer_date_after_due_date: Uitsteldatum is na de vervaldag. Gelieve vervaldag
+      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
     delete: Verwijder
     delete_action: Verwijder actie
-    delete_recurring_action_confirm: Weet u zeker dat u wilt de terugkerende actie '%{description}' wilt verwijderen?
+    delete_recurring_action_confirm: Weet u zeker dat u wilt de terugkerende actie
+      '%{description}' wilt verwijderen?
     delete_recurring_action_title: Verwijder de terugkerende actie
     deleted_success: De actie werd met succes verwijderd.
     depends_on: Hangt af van
     depends_on_separate_with_commas: Afhankelijk van (gescheiden door komma's)
     done: Voltooid?
-    drag_action_title: Sleep naar een andere actie om deze afhankelijk te maken van die actie
+    drag_action_title: Sleep naar een andere actie om deze afhankelijk te maken van
+      die actie
     due: Deadline
     edit: Bewerken
     edit_action: Actie bewerken
@@ -956,13 +1021,19 @@ nl:
     error:
       invalid_due_date: Ongeldige deadline datum
       invalid_show_from_date: Ongeldige datum voor tonen vanaf
-    error_completing_todo: Er was een fout bij het voltooien / activeren van de terugkerende actie '%{description}'
-    error_deleting_item: Er is een fout opgetreden bij het verwijderen van het item '%{description}'
-    error_deleting_recurring: Er is een fout opgetreden bij het verwijderen van het item '%{description}'
-    error_removing_dependency: Er is een fout opgetreden het verwijderen van de afhankelijke actie
-    error_saving_recurring: Er is een fout opgetreden het opslaan van de terugkerende actie '%{description}'
+    error_completing_todo: Er was een fout bij het voltooien / activeren van de terugkerende
+      actie '%{description}'
+    error_deleting_item: Er is een fout opgetreden bij het verwijderen van het item
+      '%{description}'
+    error_deleting_recurring: Er is een fout opgetreden bij het verwijderen van het
+      item '%{description}'
+    error_removing_dependency: Er is een fout opgetreden het verwijderen van de afhankelijke
+      actie
+    error_saving_recurring: Er is een fout opgetreden het opslaan van de terugkerende
+      actie '%{description}'
     error_starring: Kon niet de ster van deze actie niet omzetten '%{description}'
-    error_starring_recurring: Kon niet de ster van deze terugkerende actie niet omzetten '%{description}'
+    error_starring_recurring: Kon niet de ster van deze terugkerende actie niet omzetten
+      '%{description}'
     error_toggle_complete: Kon deze actie niet als afgerond markeren
     feed_title_in_context: in context '%{context}'
     feed_title_in_project: In het project '%{project}'
@@ -976,10 +1047,12 @@ nl:
     in_hidden_state: in verborgen toestand
     in_pending_state: in wachtende toestand
     list_incomplete_next_actions: Toon onvoltooide acties
-    list_incomplete_next_actions_with_limit: Toont de laatste %{count} onvoltooide acties
+    list_incomplete_next_actions_with_limit: Toont de laatste %{count} onvoltooide
+      acties
     mark_complete: Markeer gereed
     mobile_todos_page_title: Alle acties
-    new_related_todo_created: Een nieuwe actie is toegevoegd, die behoort bij deze terugkerende todo
+    new_related_todo_created: Een nieuwe actie is toegevoegd, die behoort bij deze
+      terugkerende todo
     new_related_todo_created_short: een nieuwe actie gemaakt
     new_related_todo_not_created_short: een nieuwe actie is niet gemaakt
     next_action_description: Actie beschrijving
@@ -1108,9 +1181,11 @@ nl:
       yearly_every_x_day: Elke %{month} %{day}
       yearly_every_xth_day: De %{day} %{day_of_week} van %{month}
       yearly_options: Instellingen voor jaarlijks terugkerende acties
-    recurrence_completed: Er is geen volgende actie na de terugkerende actie die u zojuist hebt voltooid. De herhaling is voltooid
+    recurrence_completed: Er is geen volgende actie na de terugkerende actie die u
+      zojuist hebt voltooid. De herhaling is voltooid
     recurrence_period: Herhaling periode
-    recurring_action_deleted: Actie werd verwijderd. Omdat deze actie herhalend is. werd een nieuwe actie toegevoegd
+    recurring_action_deleted: Actie werd verwijderd. Omdat deze actie herhalend is.
+      werd een nieuwe actie toegevoegd
     recurring_action_saved: Terugkerende actie opgeslagen
     recurring_actions_title: TRACKS::Terugkerende acties
     recurring_deleted_success: De recurrente actie is succesvol verwijderd.
@@ -1134,27 +1209,35 @@ 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 veld is niet herleidbaar naar een bestaande actie. Deze waarde wordt niet bewaard met de rest van de actie. Doorgaan?
+    unresolved_dependency: De waarde die u ingevoerd heeft in het afhankelijkheden
+      veld is niet herleidbaar naar een bestaande actie. Deze waarde wordt niet bewaard
+      met de rest van de actie. Doorgaan?
     was_due_on_date: had deadline op %{date}
   users:
     account_signup: Aanmelden voor een account
     approve_tos: I approve the Terms of Service
     auth_change_submit: Wijzigen authenticatietype
-    auth_type_update_error: 'Er was een probleem met het bijwerken van uw authenticatietype: %{error_messages}'
+    auth_type_update_error: 'Er was een probleem met het bijwerken van uw authenticatietype:
+      %{error_messages}'
     auth_type_updated: Authenticatietype bijgewerkt.
     change_auth_type_title: TRACKS::Wijzig authenticatietype
     change_authentication_type: Wijzigen authenticatietype
-    change_password_prompt: Voer uw nieuwe wachtwoord in de onderstaande velden in en kies 'Wachtwoord wijzigen' om uw huidige wachtwoord met uw nieuwe te vervangen.
+    change_password_prompt: Voer uw nieuwe wachtwoord in de onderstaande velden in
+      en kies 'Wachtwoord wijzigen' om uw huidige wachtwoord met uw nieuwe te vervangen.
     change_password_submit: Wachtwoord wijzigen
     change_password_title: TRACKS::Wachtwoord wijzigen
     choose_password: Kies een wachtwoord
     confirm_password: Bevestig wachtwoord
     desired_login: Gewenste login
-    destroy_confirmation: 'Waarschuwing: dit zal de gebruiker ''%{login} verwijderen met al zijn acties, contexten, projecten en notities. Weet u zeker dat u wilt doorgaan?'
-    destroy_error: Er is een fout opgetreden bij het verwijderen van de gebruiker '%{login}'
+    destroy_confirmation: 'Waarschuwing: dit zal de gebruiker ''%{login} verwijderen
+      met al zijn acties, contexten, projecten en notities. Weet u zeker dat u wilt
+      doorgaan?'
+    destroy_error: Er is een fout opgetreden bij het verwijderen van de gebruiker
+      '%{login}'
     destroy_successful: Gebruiker %{login} met succes verwijderd
     destroy_user: Verwijder de gebruiker
     email_address: Email address
@@ -1169,12 +1252,15 @@ nl:
     new_user_heading: 'Registreer een nieuwe gebruiker:'
     new_user_title: 'TRACKS:: Aanmelden als de admin gebruiker'
     no_signups_title: 'TRACKS:: Geen nieuwe aanmeldingen'
-    openid_ok_pref_failed: Je hebt succesvol de %{url} geverifieerd als je identiteit, maar er was een probleem met het opslaan van uw authenticatie voorkeuren.
-    openid_url_verified: Je hebt %{url} met succes geverifieerd als je identiteit en uw authenticatie type OpenID opgeslagen.
+    openid_ok_pref_failed: Je hebt succesvol de %{url} geverifieerd als je identiteit,
+      maar er was een probleem met het opslaan van uw authenticatie voorkeuren.
+    openid_url_verified: Je hebt %{url} met succes geverifieerd als je identiteit
+      en uw authenticatie type OpenID opgeslagen.
     password_confirmation_label: Bevestig wachtwoord
     password_updated: Wachtwoord bijgewerkt.
     register_with_cas: Met uw CAS gebruikersnaam
-    select_authentication_type: Selecteer uw nieuwe authenticatie type en klik op 'Wijzigen authenticatietype' om uw huidige instellingen te vervangen.
+    select_authentication_type: Selecteer uw nieuwe authenticatie type en klik op
+      'Wijzigen authenticatietype' om uw huidige instellingen te vervangen.
     signup: Aanmelden
     signup_new_user: Registreer nieuwe gebruiker
     signup_successful: Aanmelding succesvol voor gebruiker %{username}.
@@ -1191,14 +1277,13 @@ nl:
     next_label: Volgende »
     page_entries_info:
       multi_page: Toon %{model} %{from} - %{to} van %{count} in totaal
-      multi_page_html: Toon %{model} %{from} - %{to} van %{count} in totaal
+      multi_page_html: Toon %{model} %{from} - %{to} van %{count}
+        in totaal
       single_page:
-        one: Toon 1 %{model}
-        other: Toon alle %{count} %{model}
-        zero: Geen %{model} gevonden
+        one: Geen %{model} gevonden
+        other: Toon 1 %{model}
       single_page_html:
-        one: Toon 1 %{model}
-        other: Toon alle %{count} %{model}
-        zero: Geen %{model} gevonden
+        one: Geen %{model} gevonden
+        other: Toon 1 %{model}
     page_gap: "…"
     previous_label: "«Vorige"

From fcdc464725a1b0c9f149a538b6eca556ac376ced Mon Sep 17 00:00:00 2001
From: gallegonovato 
Date: Sat, 27 Jan 2024 18:23:37 +0000
Subject: [PATCH 641/767] Translated using Weblate (Spanish)

Currently translated at 100.0% (1119 of 1119 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/es/
---
 config/locales/es.yml | 246 +++++++++++++++++++++++++++++++++---------
 1 file changed, 197 insertions(+), 49 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index d576e9e2..9f24b55e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -152,13 +152,13 @@ es:
     show_all: Mostrar todo
     sort:
       alphabetically: Alfabéticamente
-      alphabetically_confirm: "¿Está seguro que desea ordenar estos proyectos alfabéticamente?\
-        \ Esto reemplazará el orden existente."
+      alphabetically_confirm: "¿Está seguro que desea ordenar estos proyectos alfabéticamente?
+        Esto reemplazará el orden existente."
       alphabetically_title: Ordenar proyectos 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: "¿Seguro que desea ordenar estos proyectos por\
-        \ el número de tareas? Esto reemplazará la ordenación existente."
+      by_task_count_title_confirm: "¿Seguro que desea ordenar estos proyectos por
+        el número de tareas? Esto reemplazará la ordenación existente."
       sort: Ordenar
     third: Tercero
     todo: pendiente
@@ -177,9 +177,9 @@ es:
     context_name: Nombre contextual
     context_state: Estado contextual
     delete_context: Borrar contexto
-    delete_context_confirmation: "¿Seguro que desea borrar el contexto '%{name}'?\
-      \ ¡Tenga en cuenta que esto también borra todas las acciones (recurrentes) dentro\
-      \ de este contexto!"
+    delete_context_confirmation: "¿Seguro que desea borrar el contexto '%{name}'?
+      ¡Tenga en cuenta que esto también borra todas las acciones (recurrentes) dentro
+      de este contexto!"
     delete_context_title: Borrar contexto
     edit_context: Editar contexto
     hidden_contexts: Contextos ocultos
@@ -209,8 +209,8 @@ es:
         some: Han ocurrido algunos errores durante la importación
         file_blank: 'Archivo no puede estar en blanco'
         invalid_csv: "CSV inválido: no pudo leer cabeceras: %{e}"
-        save_error: "No pudo guardar CSV subido (%{path_and_file}). Puede hacer un\
-          \ seguimiento de escritura al directorio de la subida? %{e}"
+        save_error: "No pudo guardar CSV subido (%{path_and_file}). Puede hacer un
+          seguimiento de escritura al directorio de la subida? %{e}"
         no_context: No pudo encontrar un contexto predeterminado
       map_title: 'Asocia campos a ser importados'
       header: Importando datos
@@ -222,12 +222,12 @@ es:
       projects_count: "%{count} proyectos importados"
       todos_count: "%{count} pendientes importados"
       yaml_disabled: "Carga YAML deshabilitada"
-      yaml_warning: "%{warning}: todos sus datos actuales serán destruidos antes de\
-        \ importar el archivo YAML, por lo que si tiene acceso a la base de datos,\
-        \ le recomendamos encarecidamente respaldar la base de dato ahora mismo, por\
-        \ si algo pueda salir mal."
-      paste_field: "Pegue el contenido del archivo YAML que ha exportado a la caja\
-        \ de texto de abajo:"
+      yaml_warning: "%{warning}: todos sus datos actuales serán destruidos antes de
+        importar el archivo YAML, por lo que si tiene acceso a la base de datos, le
+        recomendamos encarecidamente respaldar la base de dato ahora mismo, por si
+        algo pueda salir mal."
+      paste_field: "Pegue el contenido del archivo YAML que ha exportado a la caja
+        de texto de abajo:"
       warning: Aviso
     export:
       page_title: Tracks::Export
@@ -236,11 +236,11 @@ es:
       yaml_description: "%{yaml}: Mejor formato para exportar datos."
       yaml_link_description: Fichero YAML con todas sus acciones, contextos, proyectos,
         etiquetas y notas
-      yaml_experimental: "Por favor tenga en cuenta que la importación de ficheros\
-        \ YAML actualmente esta soportada de forma experimental. No confíe en este\
-        \ formato para hacer copias de seguridad de datos importantes."
-      csv_description: "%{csv}: Mejor formato para importar en una hoja de cálculo\
-        \ o en programas de análisis de datos"
+      yaml_experimental: "Por favor tenga en cuenta que la importación de ficheros
+        YAML actualmente esta soportada de forma experimental. No confíe en este formato
+        para hacer copias de seguridad de datos importantes."
+      csv_description: "%{csv}: Mejor formato para importar en una hoja de cálculo
+        o en programas de análisis de datos"
       csv_actions_description: Fichero CSV con todas sus acciones, con contextos por
         nombre y proyectos
       csv_notes_description: Fichero CSV con todas sus notas
@@ -465,6 +465,30 @@ es:
       description: Si desea enviar tareas por correo electrónico a Tracks, pero no
         puede ejecutar un servidor de correo en el mismo host, puede utilizar la compatibilidad
         con %{mailgun_link} integrada en Tracks.
+      conditions: Para que esto funcione, su servidor de Tracks tendrá que ser accesible
+        desde Internet, para que Mailgun pueda enviarle datos.
+      instructions:
+        '1': Vaya a %{mailgun_link} y regístrese para obtener una cuenta gratuita.
+        '3': Vaya a %{preferences_link} e introduzca su dirección de correo electrónico
+          entrante de Mailgun (por ejemplo, tracks@user.mailgun.com) en la casilla
+          "%{sms_email_name}".
+        '4': Seleccione un contexto predeterminado para los correos electrónicos que
+          se pondrán con "%{sms_context_name}"
+        '2': "Vaya a 'Rutas' en el panel de control de Mailgun, y añada una nueva
+          ruta:"
+        2a: La 'Expresión de filtro' debe establecerse en 'catch_all()'
+        2b: "'Acción' debe ser 'adelante (\"http://mytracksserver.example.com/mailgun/mime\"\
+          )'"
+        '5': Añade tu clave de API de Mailgun (no la clave de API pública) a los Tracks
+          'site.yml'
+        '6': "Actualice el mapa de correo en 'site.yml' para definir qué remitentes
+          pueden enviar correos electrónicos a qué direcciones entrantes. Por ejemplo,
+          para enviar correos electrónicos desde sus cuentas de correo electrónico
+          del trabajo y de casa a su ruta Tracks Mailgun, configúrelo de la siguiente
+          manera: %{code}"
+      gateway_instructions: Todos los comentarios sobre el formato de correo electrónico
+        de la sección anterior se aplican a la gestión de Mailgun, ya que los datos
+        se procesan de la misma manera
     developer_documentation_link: Información para desarrolladores de Tracks
     cron_email_subject: Realiza un seguimiento de las acciones que vencen en los próximos
       7 días
@@ -484,13 +508,41 @@ es:
     cron_1: Si ingresa la siguiente entrada a su crontab, recibirá un correo electrónico
       todos los días alrededor de las 5 AM con una lista de las próximas acciones
       que deben realizarse dentro de los próximos 7 días.
+    example_names:
+      context: contexto
+      project: proyecto
+      tag:
+        '1': etiqueta1
+        '2': etiqueta2
+      todo: mi impresionante tarea
+    email_rich:
+      description: 'Para los dos métodos anteriores, se puede utilizar el siguiente
+        formato en el asunto del mensaje para añadir metadatos:'
+      fields_title: 'Los campos son:'
+      symbol_title: Símbolo
+      meaning_title: Significado
+      field_descriptions:
+        due_date: La fecha de vencimiento de las tareas (puede ser de 2 dígitos para
+          el día, de 4 dígitos para el mes-día o de 6 dígitos para el año-mes-día)
+        tag: Una etiqueta para aplicar a la tarea - puede utilizarse varias veces
+        star: Bandera para empezar la tarea
+        project: El proyecto para colocar la tarea en
+        context: El contexto en el que colocar la tarea
+        tickler_date: La fecha clave para las tareas (puede ser de 2 dígitos para
+          el día, 4 dígitos para el día del mes o 6 dígitos para el día del mes)
+      fields_instruction: Todos los símbolos son opcionales, y el texto hasta el primer
+        símbolo (o el final de la cadena) se utiliza como descripción de la tarea
   help:
     title: Help
-    usage: ''
+    usage: 'Puedes encontrar información sobre el uso en el %{manual_link} en la wiki
+      de GitHub del proyecto.'
     manual_link_text: User manual
-    bugs: ''
-    issue_link_text: ''
-    contribute: ''
+    bugs: 'Si encuentras un error o tienes una petición de funcionalidad, por favor
+      infórmalo en el %{issue_link}.'
+    issue_link_text: 'cola de problemas'
+    contribute: 'Todas las contribuciones a Tracks son bienvenidas. Consulta el enlace
+      %{contribute_link} para más información. También puedes venir a debatir con
+      la comunidad:'
     contribute_link_text: project website
     mailing_list_link_text: Mailing list
     irc_bullet: '%{irc_link} (también disponible en %{matrix_link})'
@@ -510,7 +562,7 @@ es:
       tickler: Recordatorio
     navigation:
       admin: Admin
-      api_docs: ''
+      api_docs: 'Documentación sobre la API REST'
       calendar: Calendario
       calendar_title: Calendario de las acciones pendientes
       completed_tasks: Hecho
@@ -518,7 +570,7 @@ es:
       contexts_title: Contextos
       export: Exportar
       export_title: Exportar datos
-      feeds: ''
+      feeds: 'Feeds'
       feeds_title: Vea un listado de alimentaciones disponibles
       group_view_by_context: Grupo por contexto
       group_view_by_project: Grupo por proyecto
@@ -532,7 +584,7 @@ es:
       integrations_: Pistas Integradas
       manage_users: Administrar usuarios
       manage_users_title: Añadir o eliminar usuarios
-      mobile: ''
+      mobile: 'Version móvil'
       notes_title: Mostrar todas las notas
       options: Opciones
       organize: Organizar
@@ -553,34 +605,35 @@ es:
       tickler: Recordatorio
       tickler_title: Recordatorio
       view: Ver
-    next_actions_rss_feed: ''
+    next_actions_rss_feed: 'RSS de las próximas acciones'
     toggle_contexts: Conmuta contextos colapsados
     toggle_contexts_title: Hacer que los contextos colapsados sea (in)visibles
     toggle_notes: Conmuta anotaciones
     toggle_notes_title: Conmuta todas las anotaciones
   login:
     account_login: Acceso a la cuenta
-    cas_create_account: ''
-    cas_logged_in_greeting: ''
-    cas_login: ''
-    cas_no_user_found: ''
+    cas_create_account: 'Si desea realizar una solicitud, por favor vaya aquí %{signup_link}'
+    cas_logged_in_greeting: '¡Hola, %{username}! Está autenticad@.'
+    cas_login: 'Inicio de sesión en CAS'
+    cas_no_user_found: '¡Hola, %{username}! No tienes una cuenta en Tracks.'
     cas_signup_link: Solicitar cuenta
     cas_username_not_found: Disculpe, ningún usuario por esa id de usuario CAS existe
       (%{username})
-    log_in_again: ''
-    logged_out: ''
-    login_cas: ''
-    login_standard: ''
-    login_with_openid: ''
-    mobile_use_openid: ""
-    openid_identity_url_not_found: ''
+    log_in_again: 'conéctate de nuevo.'
+    logged_out: 'Has salido de Tracks.'
+    login_cas: 'ir al CAS'
+    login_standard: 'volver al inicio de sesión estándar'
+    login_with_openid: 'iniciar sesión con OpenID'
+    mobile_use_openid: "...o iniciar sesión con OpenID"
+    openid_identity_url_not_found: 'Lo sentimos, no existe ningún usuari@ con esa
+      URL (%{identity_url})'
     option_separator: o,
-    please_login: ''
-    session_time_out: ''
-    session_will_expire: ''
+    please_login: 'Por favor, inicia sesión para utilizar Tracks'
+    session_time_out: 'La sesión ha expirado. Por favor %{link}'
+    session_will_expire: 'la sesión expirará tras %{hours} hora(s) de inactividad.'
     session_will_not_expire: sesión no caducada.
     sign_in: Entrar
-    signup_prompt: ''
+    signup_prompt: '¿Quiere crear una cuenta?'
     successful: Has entrado correctamente. ¡Bienvenido de nuevo!
     successful_with_session_info: 'Entrada correcta:'
     unsuccessful: Entrada incorrecta.
@@ -603,9 +656,10 @@ es:
     user:
       error_context_not_associated: ID de contexto %{context} no asociado con el id
         %{user} del usuario.
-      error_project_not_associated: ''
+      error_project_not_associated: 'El id de proyecto %{project} no está asociado
+        al id de usuario %{user}.'
   notes:
-    delete_confirmation: ''
+    delete_confirmation: '¿Estás seguro de que quieres borrar la nota ''%{id}''?'
     delete_item_title: Delete item
     delete_note_confirm: Are you sure that you want to delete the note '%{id}'?
     delete_note_title: Delete the note '%{id}'
@@ -701,6 +755,8 @@ es:
     token_description: Token (for feeds and API use)
     token_header: Su vale
     updated: Las preferencias de actualización
+    pick_one: 'O elige uno de los siguientes:'
+    result_in: 'Esto dará lugar a: '
   projects:
     actions_in_project_title: Acciones en este proyecto
     active_projects: Proyectos Activos
@@ -1047,7 +1103,8 @@ es:
     depends_on: Depends on
     depends_on_separate_with_commas: Depende de (separar con comas)
     done: Done?
-    drag_action_title: ''
+    drag_action_title: 'Arrastre sobre otra acción para marcar esa acción como dependencia
+      de esta acción.'
     due: Fecha límite
     edit: Edit
     edit_action: Edit action
@@ -1246,10 +1303,12 @@ es:
       other: ''
     to_tickler: al recordatorio
     unable_to_add_dependency: Es imposible añadir dependencia
-    unresolved_dependency: ''
+    unresolved_dependency: 'El valor que ha introducido en el campo de dependencia
+      no se ha resuelto con una acción existente. Este valor no se guardará con el
+      resto de la acción. ¿Continuar?'
     was_due_on_date: venció el %{date}
   users:
-    account_signup: ''
+    account_signup: 'Registro de la cuenta'
     approve_tos: Apruebo los Términos del Servicio
     auth_change_submit: Modifica el tipo de autenticación
     auth_type_update_error: 'Hubo un problema actualizando su tipo de autenticación:
@@ -1264,7 +1323,8 @@ es:
     choose_password: Elija contraseña
     confirm_password: Conformar contraseña
     desired_login: Acceso deseado
-    destroy_confirmation: ''
+    destroy_confirmation: 'Aviso: esto eliminará al usuario ''%{login}'', todas sus
+      acciones, contextos, proyecto y notas. ¿Está seguro de que desea continuar?'
     destroy_error: Hubo un error al borrar el usuario %{login}
     destroy_successful: El usuario %{login} fue destruido completamente
     destroy_user: Destruir usuario
@@ -1302,6 +1362,7 @@ es:
     total_users_count: You have a total of %{count} users
     user_created: User created.
     you_have_to_reset_your_password: Usted tiene que restablecer su contraseña
+    manage_users_title: TRACKS::Gestión de usuarios
   will_paginate:
     next_label: Siguiente »
     page_entries_info:
@@ -1321,7 +1382,94 @@ es:
   rest_help:
     auth:
       title: Autenticación
+      basic_auth_link_text: Autenticación HTTP básica
+      content: La autenticación se gestiona mediante %{auth_link}. Su nombre de usuario
+        y contraseña de Tracks se utilizan como credenciales de autenticación para
+        la API. Tenga en cuenta que en la autenticación HTTP básica, su contraseña
+        se envía en texto claro. Si necesitas una solución de autenticación más segura,
+        debes configurar tu servidor web para ejecutar Tracks bajo HTTPS.
     activeresource:
       ror_link_text: Ruby on Rails
+      title: Consumir la API con ActiveResource
+      activeresource_link_text: ActiveResource
+      wrapper_description: 'Inspirándonos en el contenedor Highrise de %{signals_link},
+        creamos un pequeño contenedor Ruby (que se encuentra en el directorio doc/-)
+        para la interfaz que crea modelos ActiveResource para que juegues con ellos
+        en una sesión IRB:'
+      description: '%{activeresource_link} es un contenedor delgado pero poderoso
+        para los servicios RESTful expuestos por %{ror_link}. Será parte de Rails
+        2.0 pero hasta entonces podrás obtenerlo con %{gem_command}.'
+      signals_link_text: 37 Signals
     notes:
       curl_description: Todos los ejemplos utilizan %{curl}.
+      description: 'En la documentación se han aplicado algunas convenciones, las
+        cuales son:'
+      bullet1: '%{id} del recurso %{url} indica que debe reemplazarse con el identificador
+        único del recurso'
+      bullet2: '%{omit} indica que se han omitido partes irrelevantes de los datos
+        de la respuesta para aclarar la instrucción'
+      title: Notas sobre la documentación
+    title: Documentación de la API REST para desarrolladores
+    id: ID
+    curl_link_text: cURL
+    intro:
+      title: Introducción
+      content: Tracks está diseñado para integrarse con scripts, servicios web y aplicaciones
+        de terceros. Esta página sirve como documentación de nuestra API REST.
+      content_2: La API REST de Tracks permite a los desarrolladores integrar Tracks
+        en sus aplicaciones. Permite a las aplicaciones acceder a los datos de Tracks
+        y modificarlos, y se implementa como Vanilla XML sobre HTTP.
+      restful_link_text: RESTful
+      content_3: La API es un servicio %{restful_link}. Todos los datos están disponibles
+        a través de la API como un recurso al que se puede hacer referencia utilizando
+        un identificador único. Responde a varios de los métodos HTTP, concretamente
+        GET, PUT, POST y UPDATE, y todas las respuestas de la API están en un formato
+        XML sencillo codificado como UTF-8.
+    writing:
+      example_todo_response_title: 'La respuesta es de nuevo un %{response_code} con
+        la cabecera %{header} indicando dónde se puede encontrar el nuevo recurso
+        todo. Cambiando las notas de todo, de nuevo usando curl:'
+      title: Escribiendo en la API
+      example_project_response_title: 'La respuesta es un %{response_code} con una
+        cabecera %{header} que indica dónde se puede encontrar el nuevo recurso del
+        proyecto. Ahora podemos añadir una tarea a este proyecto, usando curl:'
+      example_todo_name: Modelar la casa del árbol en SketchUp
+      example_note_text: usar textura de arce
+      example_delete_title: 'Si queremos borrar esa tarea podemos llamar a su identificador
+        único de recurso (la URL) con el método HTTP %{delete}, de nuevo con curl:'
+      example_delete_response_title: La API devuelve un %{response_code} y la tarea
+        se elimina.
+      example_title: 'Creando un nuevo proyecto, usando curl:'
+      description: La API proporciona mecanismos para añadir, actualizar y eliminar
+        recursos utilizando los métodos HTTP %{put}, %{post} y %{delete} en combinación
+        con el contenido.
+      example_project_name: Construir una casa en el árbol para los niños
+      example_note_response_title: 'La respuesta es un %{response_code} con en el
+        cuerpo la representación XML de la tarea actualizada. Proporcionamos un método
+        abreviado para activar o desactivar una tarea sin tener que realizar la actualización
+        con los valores de campo correctos:'
+    retrieve:
+      content: 'Para recuperar datos basta con hacer un HTTP GET sobre un identificador
+        de recurso. Por ejemplo, si desea obtener todos los contextos con %{curl_link}:'
+      single_context: 'Obtener un contexto único:'
+      todos_from_context: 'Obtener las tareas dentro de un contexto:'
+      paths_title: 'Todos los datos están disponibles según las siguientes rutas de
+        recursos:'
+      active_todos: 'Si sólo quieres obtener las tareas activas, añade el parámetro
+        %{active_code} y ponlo en algún valor como este:'
+      title: Recuperar datos de la API
+      projects: También puede aplicar el patrón mostrado anteriormente con proyectos
+        en lugar de contextos.
+      limit: 'Para los recursos de tareas pendientes (tareas, tickler, hecho, oculto
+        y calendario), puede limitar el campo devuelto a %{fields} agregando el parámetro
+        %{limit_parameter} y configurándolo en %{set_to}. Por ejemplo:'
+    response:
+      title: Tratamiento de la respuesta y estado de la respuesta
+      description: Todas las operaciones exitosas responden con un código de estado
+        de %{response_200} o %{response_201} dependiendo de la operación. A veces
+        una lista, digamos %{example_call} no tendrá ningún elemento, devolverá una
+        lista vacía.
+      xml_description: 'El XML para las respuestas de la lista vacía tiene este aspecto,
+        de nuevo con curl:'
+  auth_type:
+    database: Base de datos

From 6274e9e1d39dac497005b41cd931fd7c3c72514d Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 17 Jun 2024 12:46:01 +0300
Subject: [PATCH 642/767] Changelog for release 2.7

---
 doc/CHANGELOG.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index e051dee1..f0245067 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,5 +1,29 @@
 See doc/upgrading.md for the upgrade documentation!
 
+## Version 2.7
+
+### Removed features
+
+* Support for Ruby 2.6 and 2.7 were dropped.
+* Support for inbound message handling was dropped due to API changes caused by required Ruby on Rails upgrade. If you need this, comment in the issue https://github.com/TracksApp/tracks/issues/2463
+* Rubocop is no longer used in the CI due to missing support for Ruby > 2.5.
+
+### Deprecations
+
+* This will be the last release to support Ruby 3.0, which is already end-of-life.
+
+### Bug fixes
+
+* The base version for the Docker image was updated from Ruby 2.7 to Ruby 3.3.
+* Lots of dependencies have been updated (including security updates).
+
+### Updated translations
+
+* Spanish (thanks Gallegonovato!)
+* Dutch (thanks Ranforingus!)
+* Russian (thanks Alexey Svistunov!)
+* Turkish (thanks Burak Hüseyin Ekseli!)
+
 ## Version 2.6.1
 
 ### Deprecations

From d5235e8c61ae04edc103508d7edf5b5ba541530a Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 17 Jun 2024 12:46:16 +0300
Subject: [PATCH 643/767] Move default build to Ruby 3.3, test only MySQL for
 Rubies 3.1 & 3.2 (middle versions)

---
 .github/workflows/continuous-integration.yml |  4 +++
 Dockerfile                                   |  4 +--
 Dockerfile-3.3 => Dockerfile-3.1             |  2 +-
 test-envs/docker-compose-3.1-mysql.yml       |  2 +-
 test-envs/docker-compose-3.1-postgres.yml    | 32 --------------------
 test-envs/docker-compose-3.1-sqlite.yml      | 17 -----------
 test-envs/docker-compose-3.2-postgres.yml    | 32 --------------------
 test-envs/docker-compose-3.2-sqlite.yml      | 17 -----------
 8 files changed, 8 insertions(+), 102 deletions(-)
 rename Dockerfile-3.3 => Dockerfile-3.1 (98%)
 delete mode 100644 test-envs/docker-compose-3.1-postgres.yml
 delete mode 100644 test-envs/docker-compose-3.1-sqlite.yml
 delete mode 100644 test-envs/docker-compose-3.2-postgres.yml
 delete mode 100644 test-envs/docker-compose-3.2-sqlite.yml

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 3c238552..9d89cdfa 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -9,6 +9,10 @@ jobs:
         ruby: ["3.0", "3.1", "3.2", "3.3"]
         db: [sqlite, mysql, postgres]
         exclude:
+          - ruby: "3.1"
+            db: sqlite
+          - ruby: "3.1"
+            db: postgres
           - ruby: "3.2"
             db: sqlite
           - ruby: "3.2"
diff --git a/Dockerfile b/Dockerfile
index f1f6d7cd..1a637feb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.3
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
@@ -8,7 +8,7 @@ WORKDIR /app
 RUN touch /etc/app-env
 
 COPY Gemfile* /app/
-RUN gem install bundler -v 2.4.22
+RUN gem install bundler
 RUN bundle install --jobs 4
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
diff --git a/Dockerfile-3.3 b/Dockerfile-3.1
similarity index 98%
rename from Dockerfile-3.3
rename to Dockerfile-3.1
index 0e143fd7..13ee22a2 100644
--- a/Dockerfile-3.3
+++ b/Dockerfile-3.1
@@ -1,4 +1,4 @@
-FROM ruby:3.2
+FROM ruby:3.1
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/test-envs/docker-compose-3.1-mysql.yml b/test-envs/docker-compose-3.1-mysql.yml
index 67e67f17..03f609e5 100644
--- a/test-envs/docker-compose-3.1-mysql.yml
+++ b/test-envs/docker-compose-3.1-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.1
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.1-postgres.yml b/test-envs/docker-compose-3.1-postgres.yml
deleted file mode 100644
index a66d41b2..00000000
--- a/test-envs/docker-compose-3.1-postgres.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: '3'
-services:
-  db:
-    image: postgres:13
-    environment:
-      POSTGRES_DB: ${DATABASE_NAME:-tracks}
-      POSTGRES_PASSWORD: password
-    volumes:
-      - db-data:/var/lib/postgresql/data
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: $DATABASE_NAME
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: password
-      DATABASE_TYPE: postgresql
-      DATABASE_ENCODING: unicode
-      DATABASE_PORT: 5432
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
-    depends_on:
-      - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-3.1-sqlite.yml b/test-envs/docker-compose-3.1-sqlite.yml
deleted file mode 100644
index 4fd50bd5..00000000
--- a/test-envs/docker-compose-3.1-sqlite.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3'
-services:
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: "/app/db.sqlite"
-      DATABASE_TYPE: sqlite3
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
diff --git a/test-envs/docker-compose-3.2-postgres.yml b/test-envs/docker-compose-3.2-postgres.yml
deleted file mode 100644
index 16711e2d..00000000
--- a/test-envs/docker-compose-3.2-postgres.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: '3'
-services:
-  db:
-    image: postgres:13
-    environment:
-      POSTGRES_DB: ${DATABASE_NAME:-tracks}
-      POSTGRES_PASSWORD: password
-    volumes:
-      - db-data:/var/lib/postgresql/data
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile-3.2
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: $DATABASE_NAME
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: password
-      DATABASE_TYPE: postgresql
-      DATABASE_ENCODING: unicode
-      DATABASE_PORT: 5432
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
-    depends_on:
-      - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-3.2-sqlite.yml b/test-envs/docker-compose-3.2-sqlite.yml
deleted file mode 100644
index 47a2e7e0..00000000
--- a/test-envs/docker-compose-3.2-sqlite.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3'
-services:
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile-3.2
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: "/app/db.sqlite"
-      DATABASE_TYPE: sqlite3
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000

From b274c270f1007ac92230b90ed186c5d9693bf69c Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 17 Jun 2024 12:48:29 +0300
Subject: [PATCH 644/767] New version number

---
 config/initializers/tracks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb
index 77d12eac..83183ed7 100644
--- a/config/initializers/tracks.rb
+++ b/config/initializers/tracks.rb
@@ -1,3 +1,3 @@
-TRACKS_VERSION='2.6.1'
+TRACKS_VERSION='2.7'
 TRACKS_REVISION_WITH_DATE=`git log --date=format:'%Y-%m-%d' --pretty=format:"%h @ %ad" -1`
 TRACKS_REVISION=`git log --pretty=format:"%h" -1`

From 167274a6da0f7b17d09c14beb35947f89ee5689f Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 17 Jun 2024 13:11:27 +0300
Subject: [PATCH 645/767] Fix again the translations broken by Weblate

---
 config/locales/es.yml | 76 +++++++++++++++++--------------------------
 config/locales/nl.yml | 35 ++++++++++++--------
 config/locales/ru.yml | 26 ++++++++-------
 3 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9f24b55e..6f008359 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -93,15 +93,14 @@ es:
         body: 'Hubo problemas con los campos siguientes:'
         header:
           one: Un error ha impedido que se guarde este %{model}
-          many: '%{count} errores han impedido que se guarden este %{model}'
-          other: ''
+          other: '%{count} errores han impedido que se guarden este %{model}'
   common:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tareas
-      many: tarea
+      one: tarea
       other: tareas
+      zero: tareas
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -114,8 +113,7 @@ es:
     create: Crear
     days_midsentence:
       one: día
-      many: días
-      other: ''
+      other: días
     deferred: pospuestas
     description: Descripción
     drag_handle: ARRASTRAR
@@ -134,9 +132,9 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 0 notas
-      many: 1 nota
-      other: '%{count} notas'
+      one: 1 nota
+      other: "%{count} notas"
+      zero: 0 notas
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -315,49 +313,40 @@ es:
     distance_in_words:
       about_x_hours:
         one: alrededor de 1 hora
-        many: Acerca de %{count} horas
-        other: ''
+        other: Acerca de %{count} horas
       about_x_months:
         one: alrededor de 1 mes
-        many: Acerca de %{count} meses
-        other: ''
+        other: Acerca de %{count} meses
       about_x_years:
         one: alrededor de 1 año
-        many: Acerca de %{count} años
-        other: ''
+        other: Acerca de %{count} años
       almost_x_years:
         one: casi 1 año
-        many: Casi %{count} años
-        other: ''
+        other: Casi %{count} años
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de 1 minuto
-        many: menos de un minuto
+        one: menos de un minuto
         other: menos de %{count} minutos
+        zero: menos de 1 minuto
       less_than_x_seconds:
-        one: menos de %{count} segundo
-        many: más de %{count} segundos
-        other: ''
+        one: menos de 1 segundo
+        other: menos de %{count} segundos
+        zero: menos de 1 segundo
       over_x_years:
         one: más de un año
-        many: en %{count} años
-        other: ''
+        other: en %{count} años
       x_days:
         one: 1 día
-        many: '%{count} días'
-        other: ''
+        other: '%{count} días'
       x_minutes:
         one: 1 minuto
-        many: '%{count} minutos'
-        other: ''
+        other: '%{count} minutos'
       x_months:
         one: 1 mes
-        many: '%{count} meses'
-        other: ''
+        other: '%{count} meses'
       x_seconds:
         one: Un segundo
-        many: '%{count} segundos'
-        other: ''
+        other: '%{count} segundos'
     prompts:
       day: Día
       hour: Hora
@@ -709,8 +698,7 @@ es:
         units:
           byte:
             one: Byte
-            many: Bytes
-            other: ''
+            other: Bytes
           gb: GB
           kb: KB
           mb: MB
@@ -1068,8 +1056,7 @@ es:
     completed_actions_with: Acciones completadas con la lengüeta «%{tag_name}»
     completed_in_archive:
       one: There is one completed action in the archive.
-      many: There are %{count} completed actions in the archive.
-      other: ''
+      other: There are %{count} completed actions in the archive.
     completed_last_day: Completed in the last 24 hours
     completed_last_x_days: Completed in last %{count} days
     completed_recurrence_completed: There is no next action after the recurring action
@@ -1089,8 +1076,7 @@ es:
       due date before deferring.
     defer_x_days:
       one: Defer one day
-      many: Defer %{count} days
-      other: ''
+      other: Defer %{count} days
     deferred_actions_with: Deferred actions with the tag '%{tag_name}'
     deferred_pending_actions: Deferred/pending actions
     deferred_tasks_title: TRACKS::Recordatorio
@@ -1130,8 +1116,7 @@ es:
       due: 'Vence: %{date}'
     has_x_pending:
       one: Tiene una tarea pendiente
-      many: Tiene %{count} tareas pendientes
-      other: ''
+      other: Tiene %{count} tareas pendientes
     hidden_actions: Tareas ocultas
     in_hidden_state: en estado oculto
     in_pending_state: en estado pendiente
@@ -1298,9 +1283,8 @@ es:
     task_list_title: TRACKS::List etiquetadas
     tickler_items_due:
       one: Un elemento de tiquet ahora está vencido - recargue la página para verlo.
-      many: '%{count} elementos de ticket ahora están vencidos - recargue la página
+      other: '%{count} elementos de ticket ahora están vencidos - recargue la página
         para verlos.'
-      other: ''
     to_tickler: al recordatorio
     unable_to_add_dependency: Es imposible añadir dependencia
     unresolved_dependency: 'El valor que ha introducido en el campo de dependencia
@@ -1370,13 +1354,13 @@ es:
       multi_page_html: Representando %{model} %{from} - %{to} de
         %{count} en el total
       single_page:
-        one: No %{model} encontrado
-        many: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
       single_page_html:
-        one: No %{model} encontrado
-        many: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
     page_gap: "…"
     previous_label: "« Anterior"
   rest_help:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 739fa7a3..97d35ff0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -70,7 +70,7 @@ nl:
         record_invalid: 'Validatie mislukt: %{errors}'
         restrict_dependent_destroy:
           one: Kan record niet verwijderen omdat een afhankelijk %{record} bestaat
-          other: Kan record niet verwijderen omdat afhankelijke %{record} bestaan
+          many: Kan record niet verwijderen omdat afhankelijke %{record} bestaan
         taken: is al gepakt
         too_long: is te lang (maximum is %{count} karakters)
         too_short: is te kort (minimum is %{count} karakters)
@@ -91,8 +91,9 @@ nl:
     action: Actie
     actions: Acties
     actions_midsentence:
-      one: acties
-      other: actie
+      one: actie
+      other: acties
+      zero: acties
     add: Toevoegen
     ajaxError: Er is een fout opgetreden bij het ophalen van gegevens van de server
     back: Terug
@@ -104,8 +105,9 @@ nl:
     contribute: Bijdragen
     create: Maken
     days_midsentence:
-      one: dagen
-      other: dag
+      one: dag
+      other: dagen
+      zero: dagen
     deferred: uitgestelde
     description: Beschrijving
     drag_handle: SLEEP
@@ -124,8 +126,9 @@ nl:
     none: Geen
     not_available_abbr: n/b
     note:
-      one: geen notities
-      other: 1 notitie
+      one: 1 notitie
+      other: "%{count} notities"
+      zero: geen notities
     notes: Notities
     numbered_step: Stap %{number}
     ok: Ok
@@ -266,11 +269,13 @@ nl:
         other: bijna %{count} jaren
       half_a_minute: halve minuut
       less_than_x_minutes:
-        one: minder dan 1 minuut
-        other: minder dan een minuut
+        one: minder dan een minuut
+        other: minder dan %{count} minuten
+        zero: minder dan 1 minuut
       less_than_x_seconds:
         one: minder dan 1 seconde
-        other: minder dan 1 seconde
+        other: minder dan %{count} seconden
+        zero: minder dan 1 seconde
       over_x_years:
         one: over 1 jaar
         other: over %{count} jaren
@@ -1280,10 +1285,12 @@ nl:
       multi_page_html: Toon %{model} %{from} - %{to} van %{count}
         in totaal
       single_page:
-        one: Geen %{model} gevonden
-        other: Toon 1 %{model}
+        one: Toon 1 %{model}
+        other: Toon alle %{count} %{model}
+        zero: Geen %{model} gevonden
       single_page_html:
-        one: Geen %{model} gevonden
-        other: Toon 1 %{model}
+        one: Toon 1 %{model}
+        other: Toon alle %{count} %{model}
+        zero: Geen %{model} gevonden
     page_gap: "…"
     previous_label: "«Vorige"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2622d87e..ac496932 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -103,6 +103,7 @@ ru:
       one: действий
       few: действие
       many: действия
+      other: действия
     add: Добавить
     ajaxError: От сервера была получена ошибка
     back: Назад
@@ -114,9 +115,9 @@ ru:
     contribute: Сотрудничество
     create: Создать
     days_midsentence:
-      one: день
-      few: дня
-      many: дней
+      one: дней
+      few: день
+      many: дня
     deferred: отложенные
     description: Описание
     drag_handle: ТАЩИТЬ
@@ -135,9 +136,10 @@ ru:
     none: Не задано
     not_available_abbr: н/д
     note:
-      one: нет записей
-      few: 1 запись
-      many: '%{count} записи'
+      few: "%{count} записи"
+      one: 1 запись
+      other: '%{count} записи'
+      zero: нет записей
     notes: Заметки
     numbered_step: Шаг %{number}
     ok: ОК
@@ -1361,13 +1363,13 @@ ru:
       multi_page: Отображено %{model} %{from} - %{to} из %{count}
       multi_page_html: Отображено %{model} %{from} - %{to} из %{count}
       single_page:
-        one: '%{model} не найден'
-        few: Отображён 1 %{model}
-        many: Отображены все %{count} %{model}
+        one: Отображён 1 %{model}
+        other: Отображены все %{count} %{model}
+        zero: '%{model} не найден'
       single_page_html:
-        one: '%{model} не найден'
-        few: Отображен 1 %{model}
-        many: Отображены все %{count} %{model}
+        one: Отображен 1 %{model}
+        other: Отображены все %{count} %{model}
+        zero: '%{model} не найден'
     page_gap: "…"
     previous_label: "← Пред"
   rest_help:

From 1d79436a524dec4b47b43af83df6558b4fc5d358 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Mon, 17 Jun 2024 13:20:55 +0300
Subject: [PATCH 646/767] Fix Ruby 3.3 tests to correct Dockerfile

---
 test-envs/docker-compose-3.3-mysql.yml    | 2 +-
 test-envs/docker-compose-3.3-postgres.yml | 2 +-
 test-envs/docker-compose-3.3-sqlite.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-envs/docker-compose-3.3-mysql.yml b/test-envs/docker-compose-3.3-mysql.yml
index fe6891be..67e67f17 100644
--- a/test-envs/docker-compose-3.3-mysql.yml
+++ b/test-envs/docker-compose-3.3-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.3
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.3-postgres.yml b/test-envs/docker-compose-3.3-postgres.yml
index 759c880f..a66d41b2 100644
--- a/test-envs/docker-compose-3.3-postgres.yml
+++ b/test-envs/docker-compose-3.3-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.3
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.3-sqlite.yml b/test-envs/docker-compose-3.3-sqlite.yml
index e838d3bb..4fd50bd5 100644
--- a/test-envs/docker-compose-3.3-sqlite.yml
+++ b/test-envs/docker-compose-3.3-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.3
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

From f20aa13b7bb9e7869ea129b8276b8b5370f70a50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 00:55:39 +0000
Subject: [PATCH 647/767] Bump RedCloth from 4.3.3 to 4.3.4

Bumps [RedCloth](https://github.com/jgarber/redcloth) from 4.3.3 to 4.3.4.
- [Changelog](https://github.com/jgarber/redcloth/blob/master/CHANGELOG)
- [Commits](https://github.com/jgarber/redcloth/compare/v4.3.3...v4.3.4)

---
updated-dependencies:
- dependency-name: RedCloth
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d4487d0e..4850fbcf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.3.3)
+    RedCloth (4.3.4)
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
     actioncable (6.1.7.8)

From b280485ef20ec84705766235b600c48fa16ba30c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 00:20:33 +0000
Subject: [PATCH 648/767] Bump bullet from 7.1.4 to 7.1.6

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.4 to 7.1.6.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.4...7.1.6)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4850fbcf..48882364 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.3.0)
-    bullet (7.1.4)
+    bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -338,7 +338,7 @@ GEM
     websocket-extensions (0.1.5)
     will_paginate (4.0.1)
     yard (0.9.36)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby

From 720cb02697d35d68b4c059e9657f898299ee74e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 00:12:49 +0000
Subject: [PATCH 649/767] Bump mocha from 2.1.0 to 2.4.0

Bumps [mocha](https://github.com/freerange/mocha) from 2.1.0 to 2.4.0.
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v2.1.0...v2.4.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 48882364..f968fe8a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
       libv8-node (~> 21.7.2.0)
     minitest (5.23.1)
     minitest-stub-const (0.6)
-    mocha (2.1.0)
+    mocha (2.4.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
     net-imap (0.4.12)

From 713c89c6e094eb7755b559f52244db2a309aaed0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:01:21 +0000
Subject: [PATCH 650/767] Bump rspec-expectations from 3.12.3 to 3.13.1

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.12.3 to 3.13.1.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.12.3...v3.13.1)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f968fe8a..0afc88f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,7 +101,7 @@ GEM
     crass (1.0.6)
     database_cleaner (1.99.0)
     date (3.3.4)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.1.5)
     e2mmap (0.1.0)
     erubi (1.13.0)
@@ -251,10 +251,10 @@ GEM
       nokogiri
     rexml (3.3.0)
       strscan
-    rspec-expectations (3.12.3)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

From 2108b203a65249238af7fe709f8ee2d7aaaa7bf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 00:27:42 +0000
Subject: [PATCH 651/767] Bump rubocop from 1.64.1 to 1.65.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.64.1 to 1.65.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.64.1...v1.65.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 30ad6230..a55f6a62 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'listen'
-  gem 'rubocop', '~> 1.64', require: false
+  gem 'rubocop', '~> 1.65', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0afc88f6..dc72c4fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -249,19 +249,19 @@ GEM
     regexp_parser (2.9.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.3.0)
+    rexml (3.3.1)
       strscan
     rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
@@ -376,7 +376,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.2.0)
   rails_autolink
   rspec-expectations
-  rubocop (~> 1.64)
+  rubocop (~> 1.65)
   sanitize (~> 6.1)
   sassc-rails (~> 2.1.2)
   simplecov

From a66dca4a6b6122c7fd8a8e65f8fc4d531a21e173 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 00:39:04 +0000
Subject: [PATCH 652/767] Bump bullet from 7.1.6 to 7.2.0

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.6 to 7.2.0.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.6...7.2.0)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dc72c4fb..0813fee8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.3.0)
-    bullet (7.1.6)
+    bullet (7.2.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -170,7 +170,7 @@ GEM
     mini_portile2 (2.8.7)
     mini_racer (0.12.0)
       libv8-node (~> 21.7.2.0)
-    minitest (5.23.1)
+    minitest (5.24.1)
     minitest-stub-const (0.6)
     mocha (2.4.0)
       ruby2_keywords (>= 0.0.5)

From 5940fe10a6e1c29fb6ec0d969112d96706f6ca98 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 16:00:02 +0300
Subject: [PATCH 653/767] Add Stripe as an optional package

---
 Dockerfile   |  1 +
 Gemfile      | 11 +++++++----
 Gemfile.lock |  4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1a637feb..be7d456e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ FROM ruby:3.3
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
+RUN bundle config set --local without test development stripe
 
 WORKDIR /app
 
diff --git a/Gemfile b/Gemfile
index a55f6a62..6e04c5fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,11 @@ gem 'sanitize', '~> 6.1'
 gem 'tracks-chartjs-ror'
 gem 'will_paginate'
 
+group :layout do
+  gem 'listen'
+  gem 'tolk', '~> 5.0.1'
+end
+
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem 'mini_racer', group: :therubyracer
 
@@ -40,8 +45,6 @@ group :development do
   gem 'spring', '~> 4'
   gem 'yard'
 
-  gem 'tolk', '~> 5.0.1'
-
   gem 'bullet'
   gem 'rack-mini-profiler'
   gem 'solargraph'
@@ -51,12 +54,10 @@ end
 
 group :development, :test do
   gem 'byebug'
-  gem 'listen'
   gem 'rubocop', '~> 1.65', require: false
 end
 
 group :test do
-
   # get test coverage info on codeclimate
   gem 'codeclimate-test-reporter', '1.0.9', group: :test, require: nil
   gem 'database_cleaner', '~> 1'
@@ -68,3 +69,5 @@ group :test do
   gem 'rspec-expectations'
   gem 'simplecov'
 end
+
+gem 'stripe', "~> 5.24.0", group: :stripe
diff --git a/Gemfile.lock b/Gemfile.lock
index 0813fee8..fad802ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     spring (4.2.1)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
@@ -313,6 +313,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
+    stripe (5.24.0)
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -383,6 +384,7 @@ DEPENDENCIES
   solargraph
   spring (~> 4)
   sqlite3
+  stripe (~> 5.24.0)
   tolk (~> 5.0.1)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)

From ff5adc5696682475825b0911a497eec4f794de7d Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 17:12:31 +0300
Subject: [PATCH 654/767] Replace the version-specific Dockerfiles with one
 staged Dockerfile

---
 .dockerignore                                 |  2 -
 .github/workflows/build-latest.yml            |  1 +
 .github/workflows/build-release.yml           |  1 +
 Dockerfile                                    | 42 +++++++++++++------
 Dockerfile-3.0                                | 30 -------------
 Dockerfile-3.1                                | 30 -------------
 Dockerfile-3.2                                | 30 -------------
 Gemfile                                       | 30 ++++++-------
 docker-compose.yml                            |  4 +-
 script/cibuild                                |  4 +-
 script/poll-for-db                            | 18 ++++----
 test-envs/docker-compose-3.0-mysql.yml        | 29 -------------
 test-envs/docker-compose-3.1-mysql.yml        | 29 -------------
 test-envs/docker-compose-3.2-mysql.yml        | 29 -------------
 test-envs/docker-compose-3.3-postgres.yml     | 32 --------------
 test-envs/docker-compose-3.3-sqlite.yml       | 17 --------
 ...3.3-mysql.yml => docker-compose-mysql.yml} |  4 +-
 ...stgres.yml => docker-compose-postgres.yml} |  4 +-
 ...0-sqlite.yml => docker-compose-sqlite.yml} | 10 +++--
 19 files changed, 75 insertions(+), 271 deletions(-)
 delete mode 100644 Dockerfile-3.0
 delete mode 100644 Dockerfile-3.1
 delete mode 100644 Dockerfile-3.2
 delete mode 100644 test-envs/docker-compose-3.0-mysql.yml
 delete mode 100644 test-envs/docker-compose-3.1-mysql.yml
 delete mode 100644 test-envs/docker-compose-3.2-mysql.yml
 delete mode 100644 test-envs/docker-compose-3.3-postgres.yml
 delete mode 100644 test-envs/docker-compose-3.3-sqlite.yml
 rename test-envs/{docker-compose-3.3-mysql.yml => docker-compose-mysql.yml} (91%)
 rename test-envs/{docker-compose-3.0-postgres.yml => docker-compose-postgres.yml} (92%)
 rename test-envs/{docker-compose-3.0-sqlite.yml => docker-compose-sqlite.yml} (69%)

diff --git a/.dockerignore b/.dockerignore
index 51d21e85..808f30c7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,9 +3,7 @@ config/database.yml
 config/site.yml
 coverage
 db/*.sqlite3
-doc
 features
 log
 public/assets
-test
 tmp
diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml
index 53bf9d34..c9d1cce5 100644
--- a/.github/workflows/build-latest.yml
+++ b/.github/workflows/build-latest.yml
@@ -35,6 +35,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
+          target: production
           push: true
           tags: |
             tracksapp/tracks:latest
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index ccc9a016..f70b4a33 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -35,6 +35,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
+          target: production
           push: true
           tags: |
             tracksapp/tracks:${{ github.event.release.name }}
diff --git a/Dockerfile b/Dockerfile
index be7d456e..fb60c234 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,13 @@
-FROM ruby:3.3
-
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
-RUN bundle config set --local without test development stripe
+ARG RUBY_VERSION=3.3
+FROM ruby:${RUBY_VERSION} AS base
 
 WORKDIR /app
-
 RUN touch /etc/app-env
 
-COPY Gemfile* /app/
-RUN gem install bundler
-RUN bundle install --jobs 4
-
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 RUN apt-get update && apt-get install -y yarn netcat-openbsd
+RUN gem install bundler
 
 RUN mkdir /app/log
 
@@ -39,10 +32,33 @@ COPY db /app/db/
 
 COPY .git /app/.git
 
-RUN RAILS_ENV=production bundle exec rake assets:precompile
+COPY Gemfile* /app/
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
-
 EXPOSE 3000
-
 CMD ["./bin/rails", "server", "-b", "0.0.0.0"]
+
+FROM base AS precompile
+RUN bundle config set with assets
+RUN bundle config set deployment true
+RUN bundle install --jobs 4
+RUN RAILS_GROUPS=assets bundle exec rake assets:precompile
+
+# Build the environment-specific stuff
+FROM base AS production
+RUN bundle config --global frozen 1
+RUN bundle install --jobs 4
+COPY --from=precompile /app/public/assets /app/public/assets
+
+FROM base AS test
+COPY test /app/test/
+# For testing the API client
+COPY doc /app/doc/
+RUN bundle config set with development test assets
+RUN bundle config --global frozen 1
+RUN bundle install --jobs 4
+RUN RAILS_GROUPS=assets bundle exec rake assets:precompile
+
+FROM base AS development
+RUN bundle config set with development test
+RUN bundle install --jobs 4
diff --git a/Dockerfile-3.0 b/Dockerfile-3.0
deleted file mode 100644
index 534d5c92..00000000
--- a/Dockerfile-3.0
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ruby:3.0
-
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
-
-WORKDIR /app
-
-RUN touch /etc/app-env
-
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn
-
-COPY Gemfile* /app/
-RUN gem install bundler
-RUN bundle install --jobs 4
-
-RUN mkdir /app/log
-
-COPY . /app/
-COPY config/database.docker.yml /app/config/database.yml
-COPY config/site.docker.yml /app/config/site.yml
-
-RUN RAILS_ENV=production bundle exec rake assets:precompile
-
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
-
-EXPOSE 3000
-
-CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/Dockerfile-3.1 b/Dockerfile-3.1
deleted file mode 100644
index 13ee22a2..00000000
--- a/Dockerfile-3.1
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ruby:3.1
-
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
-
-WORKDIR /app
-
-RUN touch /etc/app-env
-
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn
-
-COPY Gemfile* /app/
-RUN gem install bundler
-RUN bundle install --jobs 4
-
-RUN mkdir /app/log
-
-COPY . /app/
-COPY config/database.docker.yml /app/config/database.yml
-COPY config/site.docker.yml /app/config/site.yml
-
-RUN RAILS_ENV=production bundle exec rake assets:precompile
-
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
-
-EXPOSE 3000
-
-CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/Dockerfile-3.2 b/Dockerfile-3.2
deleted file mode 100644
index 0e143fd7..00000000
--- a/Dockerfile-3.2
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ruby:3.2
-
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
-
-WORKDIR /app
-
-RUN touch /etc/app-env
-
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn
-
-COPY Gemfile* /app/
-RUN gem install bundler
-RUN bundle install --jobs 4
-
-RUN mkdir /app/log
-
-COPY . /app/
-COPY config/database.docker.yml /app/config/database.yml
-COPY config/site.docker.yml /app/config/site.yml
-
-RUN RAILS_ENV=production bundle exec rake assets:precompile
-
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
-
-EXPOSE 3000
-
-CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/Gemfile b/Gemfile
index 6e04c5fa..3e281bad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,20 +28,17 @@ gem 'sanitize', '~> 6.1'
 gem 'tracks-chartjs-ror'
 gem 'will_paginate'
 
-group :layout do
-  gem 'listen'
-  gem 'tolk', '~> 5.0.1'
-end
-
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-gem 'mini_racer', group: :therubyracer
-
 # Use --without  argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite
 gem 'mysql2', '~> 0.5.6', group: :mysql
 gem 'pg', '~> 1.5.6', group: :postgresql
 
-group :development do
+group :assets, :optional => true do
+  gem 'listen'
+  gem 'tolk', '~> 5.0.1'
+end
+
+group :development, :optional => true do
   gem 'spring', '~> 4'
   gem 'yard'
 
@@ -52,22 +49,25 @@ group :development do
   gem 'i18n-tasks', '~> 1.0.14'
 end
 
-group :development, :test do
+group :development, :test, :optional => true do
   gem 'byebug'
-  gem 'rubocop', '~> 1.65', require: false
+  gem 'rubocop', '~> 1.65'
+  gem 'mini_racer'
 end
 
-group :test do
+group :test, :optional => true do
   # get test coverage info on codeclimate
-  gem 'codeclimate-test-reporter', '1.0.9', group: :test, require: nil
+  gem 'codeclimate-test-reporter', '1.0.9'
   gem 'database_cleaner', '~> 1'
   gem 'factory_bot_rails'
   gem 'minitest-stub-const'
-  gem 'mocha', :require => false
+  gem 'mocha'
   gem 'rails-controller-testing'
   gem 'rails-dom-testing', '~> 2.2.0'
   gem 'rspec-expectations'
   gem 'simplecov'
 end
 
-gem 'stripe', "~> 5.24.0", group: :stripe
+group :stripe, :optional => true do
+  gem 'stripe', "~> 5.24.0"
+end
diff --git a/docker-compose.yml b/docker-compose.yml
index 00872463..b60ecad3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,9 @@ services:
     volumes:
       - db-data:/var/lib/mysql
   web:
-    build: .
+    build:
+      context: .
+      target: production # can also be development or test
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/script/cibuild b/script/cibuild
index 564941a4..a68de2ad 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -2,7 +2,9 @@
 
 set -e
 
-docker_compose="docker-compose --file test-envs/docker-compose-$1-$2.yml"
+export RUBY_VERSION=$1
+
+docker_compose="docker-compose --file test-envs/docker-compose-$2.yml"
 
 function cleanup() {
   $docker_compose down
diff --git a/script/poll-for-db b/script/poll-for-db
index 05b1db4b..4be07922 100755
--- a/script/poll-for-db
+++ b/script/poll-for-db
@@ -2,13 +2,15 @@
 
 echo "==> Polling DB…"
 
-appdir=$(cd $(dirname "$0")/.. && pwd)
-[ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@
+if [ "$DATABASE_TYPE" == "mysql" ]; then
+  appdir=$(cd $(dirname "$0")/.. && pwd)
+  [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@
 
-for i in {1..60}; do
-  nc -z -w5 db 3306 && exit
-  sleep 1
-done
+  for i in {1..60}; do
+    nc -z -w5 db 3306 && exit
+    sleep 1
+  done
 
-echo "Unable to reach database!"
-exit 1
+  echo "Unable to reach database!"
+  exit 1
+fi
diff --git a/test-envs/docker-compose-3.0-mysql.yml b/test-envs/docker-compose-3.0-mysql.yml
deleted file mode 100644
index 2cd0413f..00000000
--- a/test-envs/docker-compose-3.0-mysql.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-version: '3'
-services:
-  db:
-    image: mysql:5.7
-    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: 1
-      MYSQL_DATABASE: ${TRACKS_DB:-tracks}
-    volumes:
-      - db-data:/var/lib/mysql
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile-3.0
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: $DATABASE_NAME
-      DATABASE_USERNAME: root
-      DATABASE_PASSWORD_EMPTY: 1
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
-    depends_on:
-      - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-3.1-mysql.yml b/test-envs/docker-compose-3.1-mysql.yml
deleted file mode 100644
index 03f609e5..00000000
--- a/test-envs/docker-compose-3.1-mysql.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-version: '3'
-services:
-  db:
-    image: mysql:5.7
-    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: 1
-      MYSQL_DATABASE: ${TRACKS_DB:-tracks}
-    volumes:
-      - db-data:/var/lib/mysql
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile-3.1
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: $DATABASE_NAME
-      DATABASE_USERNAME: root
-      DATABASE_PASSWORD_EMPTY: 1
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
-    depends_on:
-      - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-3.2-mysql.yml b/test-envs/docker-compose-3.2-mysql.yml
deleted file mode 100644
index 48b2e6d9..00000000
--- a/test-envs/docker-compose-3.2-mysql.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-version: '3'
-services:
-  db:
-    image: mysql:5.7
-    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: 1
-      MYSQL_DATABASE: ${TRACKS_DB:-tracks}
-    volumes:
-      - db-data:/var/lib/mysql
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile-3.2
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: $DATABASE_NAME
-      DATABASE_USERNAME: root
-      DATABASE_PASSWORD_EMPTY: 1
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
-    depends_on:
-      - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-3.3-postgres.yml b/test-envs/docker-compose-3.3-postgres.yml
deleted file mode 100644
index a66d41b2..00000000
--- a/test-envs/docker-compose-3.3-postgres.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: '3'
-services:
-  db:
-    image: postgres:13
-    environment:
-      POSTGRES_DB: ${DATABASE_NAME:-tracks}
-      POSTGRES_PASSWORD: password
-    volumes:
-      - db-data:/var/lib/postgresql/data
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: $DATABASE_NAME
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: password
-      DATABASE_TYPE: postgresql
-      DATABASE_ENCODING: unicode
-      DATABASE_PORT: 5432
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
-    depends_on:
-      - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-3.3-sqlite.yml b/test-envs/docker-compose-3.3-sqlite.yml
deleted file mode 100644
index 4fd50bd5..00000000
--- a/test-envs/docker-compose-3.3-sqlite.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3'
-services:
-  web:
-    build:
-      context: ..
-      dockerfile: Dockerfile
-    environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
-      RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: "/app/db.sqlite"
-      DATABASE_TYPE: sqlite3
-    volumes:
-      - ${VOLUME:-..}:/app:Z
-      - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
-      - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
-    ports:
-      - 3000:3000
diff --git a/test-envs/docker-compose-3.3-mysql.yml b/test-envs/docker-compose-mysql.yml
similarity index 91%
rename from test-envs/docker-compose-3.3-mysql.yml
rename to test-envs/docker-compose-mysql.yml
index 67e67f17..6982fe3a 100644
--- a/test-envs/docker-compose-3.3-mysql.yml
+++ b/test-envs/docker-compose-mysql.yml
@@ -10,7 +10,9 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      target: test
+      args:
+        RUBY_VERSION: ${RUBY_VERSION}
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-postgres.yml b/test-envs/docker-compose-postgres.yml
similarity index 92%
rename from test-envs/docker-compose-3.0-postgres.yml
rename to test-envs/docker-compose-postgres.yml
index 0c6d9b03..378d30cf 100644
--- a/test-envs/docker-compose-3.0-postgres.yml
+++ b/test-envs/docker-compose-postgres.yml
@@ -10,7 +10,9 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      target: test
+      args:
+        RUBY_VERSION: ${RUBY_VERSION}
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-sqlite.yml b/test-envs/docker-compose-sqlite.yml
similarity index 69%
rename from test-envs/docker-compose-3.0-sqlite.yml
rename to test-envs/docker-compose-sqlite.yml
index ba4d3709..374ff3eb 100644
--- a/test-envs/docker-compose-3.0-sqlite.yml
+++ b/test-envs/docker-compose-sqlite.yml
@@ -3,15 +3,19 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      target: test
+      args:
+        RUBY_VERSION: ${RUBY_VERSION}
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
-      DATABASE_NAME: "/app/db.sqlite"
+      DATABASE_NAME: "/app/db/db.sqlite"
       DATABASE_TYPE: sqlite3
     volumes:
-      - ${VOLUME:-..}:/app:Z
+      - ${VOLUME:-sqlite}:/app/db:Z
       - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
       - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
     ports:
       - 3000:3000
+volumes:
+  sqlite: {}

From 212b2dc20c63f2fbb34f5d62e983d32a928d828a Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 21:36:51 +0300
Subject: [PATCH 655/767] Fix DB adapters with the same constraints as in the
 ActiveRecord files (for example
 https://github.com/rails/rails/blob/v7.1.3.4/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
 )

---
 Gemfile      | 6 +++---
 Gemfile.lock | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3e281bad..2ca6347b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,9 +29,9 @@ gem 'tracks-chartjs-ror'
 gem 'will_paginate'
 
 # Use --without  argument to skip unnecessary drivers
-gem 'sqlite3', group: :sqlite
-gem 'mysql2', '~> 0.5.6', group: :mysql
-gem 'pg', '~> 1.5.6', group: :postgresql
+gem 'sqlite3', '~> 1.4', group: :sqlite
+gem 'mysql2', '~> 0.5', group: :mysql
+gem 'pg', '~> 1.1', group: :postgresql
 
 group :assets, :optional => true do
   gem 'listen'
diff --git a/Gemfile.lock b/Gemfile.lock
index fad802ed..a368acec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -311,7 +311,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.9)
+    sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
     stripe (5.24.0)
     strscan (3.1.0)
@@ -368,8 +368,8 @@ DEPENDENCIES
   mini_racer
   minitest-stub-const
   mocha
-  mysql2 (~> 0.5.6)
-  pg (~> 1.5.6)
+  mysql2 (~> 0.5)
+  pg (~> 1.1)
   puma (~> 6.4)
   rack-mini-profiler
   rails (~> 6.1)
@@ -383,7 +383,7 @@ DEPENDENCIES
   simplecov
   solargraph
   spring (~> 4)
-  sqlite3
+  sqlite3 (~> 1.4)
   stripe (~> 5.24.0)
   tolk (~> 5.0.1)
   tracks-chartjs-ror

From 8464d0c60e70395ecb6ee8ae5fcac85f8cb67e45 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 21:39:08 +0300
Subject: [PATCH 656/767] Remove the version constraint from Stripe

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2ca6347b..a5ea9dd1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,5 +69,5 @@ group :test, :optional => true do
 end
 
 group :stripe, :optional => true do
-  gem 'stripe', "~> 5.24.0"
+  gem 'stripe'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index a368acec..1cf6f3b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -384,7 +384,7 @@ DEPENDENCIES
   solargraph
   spring (~> 4)
   sqlite3 (~> 1.4)
-  stripe (~> 5.24.0)
+  stripe
   tolk (~> 5.0.1)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)

From 0968152c5ad308c4e6ca48c0052afd70d620b02e Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 21:53:03 +0300
Subject: [PATCH 657/767] Update rexml

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1cf6f3b4..d0e75558 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -249,7 +249,7 @@ GEM
     regexp_parser (2.9.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.3.1)
+    rexml (3.3.2)
       strscan
     rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)

From d2fff6a64c4988744f0f164ce9ccfa8a3481b648 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 22:09:35 +0300
Subject: [PATCH 658/767] Don't require the .git directory to exist for a
 successful Docker build.

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fb60c234..ee0313a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,9 @@ COPY lib /app/lib/
 COPY app /app/app/
 COPY db /app/db/
 
-COPY .git /app/.git
+# Use glob to omit error if the .git directory doesn't exists (in case the
+# code is from a release archive, not a Git clone)
+COPY .gi[t] /app/.git
 
 COPY Gemfile* /app/
 

From 2bf2f9476aff3b3bde96e8ef7a2e8da993aa27f2 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 22:34:04 +0300
Subject: [PATCH 659/767] Fix a few user creation errors to be prettier

---
 app/controllers/users_controller.rb | 4 +++-
 config/locales/en.yml               | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 30b63172..159449f8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -81,13 +81,15 @@ class UsersController < ApplicationController
         end
 
         unless params['approve_tos'] == 'on' || SITE_CONFIG['tos_link'].blank?
-          render_failure "You have to accept the terms of service to sign up!"
+          notify :error,  t('users.tos_error')
+          redirect_to signup_path
           return
         end
 
         user = User.new(user_params)
 
         unless user.valid?
+          notify :error,  t('users.create_error')
           redirect_to signup_path
           return
         end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9b8efd03..102f3863 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1281,6 +1281,7 @@ en:
     change_password_title: TRACKS::Change password
     choose_password: Choose password
     confirm_password: Confirm password
+    create_error: User creation failed, maybe you already have an account here?
     desired_login: Desired login
     destroy_confirmation: 'Warning: this will delete user ''%{login}'', all their
       actions, contexts, project and notes. Are you sure that you want to continue?'
@@ -1315,6 +1316,7 @@ en:
     signup_successful: Signup successful for user %{username}.
     successfully_deleted_user: Successfully deleted user %{username}
     tos_link: read the Terms of Service
+    tos_error: You have to accept the terms of service to sign up!
     total_actions: Total actions
     total_contexts: Total contexts
     total_notes: Total notes

From ad87729e31881eb9cc0d712675542095adf42849 Mon Sep 17 00:00:00 2001
From: "Sean M. Pappalardo" 
Date: Thu, 18 Jul 2024 14:25:56 -0400
Subject: [PATCH 660/767] Update bundle config command, add instructions for
 PostgreSQL

---
 doc/installation.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index 375997e8..a3c2712a 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -153,13 +153,22 @@ Tracks is built upon a number of Ruby libraries (known as ‘gems’). The Bundl
   * If you are using SQLite:
 
         ```
-        bundle install --without "development test mysql"
+        bundle config set without "development test mysql"
+        bundle install
         ```
 
   * If you are using MySQL:
 
         ```
-        bundle install --without "development test sqlite"
+        bundle config set without "development test sqlite"
+        bundle install
+        ```
+  
+  * If you are using PostgreSQL:
+
+        ```
+        bundle config set without "development test sqlite mysql"
+        bundle install
         ```
 
   * If you are installing Tracks on Windows or Mac OS X, or if you have another JavaScript runtime such as Node.js installed, you may also append `therubyracer` as an additional "without" parameter.

From f5f0193b60e67a8b20e48e6bdce6b45ffa1d3da6 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 23:37:40 +0300
Subject: [PATCH 661/767] Add asset stuff back to being included by default for
 non-Docker users; move more asset-related packages to the group

---
 Dockerfile          |  7 ++++---
 Gemfile             | 22 ++++++++++------------
 doc/installation.md |  8 ++++----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ee0313a7..e569d8df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,13 +41,13 @@ EXPOSE 3000
 CMD ["./bin/rails", "server", "-b", "0.0.0.0"]
 
 FROM base AS precompile
-RUN bundle config set with assets
 RUN bundle config set deployment true
 RUN bundle install --jobs 4
 RUN RAILS_GROUPS=assets bundle exec rake assets:precompile
 
 # Build the environment-specific stuff
 FROM base AS production
+RUN bundle config set without assets
 RUN bundle config --global frozen 1
 RUN bundle install --jobs 4
 COPY --from=precompile /app/public/assets /app/public/assets
@@ -56,10 +56,11 @@ FROM base AS test
 COPY test /app/test/
 # For testing the API client
 COPY doc /app/doc/
-RUN bundle config set with development test assets
+RUN bundle config set without assets
+RUN bundle config set with development test
 RUN bundle config --global frozen 1
 RUN bundle install --jobs 4
-RUN RAILS_GROUPS=assets bundle exec rake assets:precompile
+COPY --from=precompile /app/public/assets /app/public/assets
 
 FROM base AS development
 RUN bundle config set with development test
diff --git a/Gemfile b/Gemfile
index a5ea9dd1..59a0a548 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,19 +3,9 @@ source 'https://rubygems.org'
 gem 'actionpack-xml_parser', '~> 2.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
 
-gem 'coffee-rails', '~> 5.0.0'
-
-gem 'jquery-rails', '~> 4.6'
-gem 'jquery-ui-rails', '~>7.0.0'
-
 gem 'rails', '~> 6.1'
-gem 'sassc-rails', '~> 2.1.2'
 
-gem 'bootstrap-sass', '3.4.1'
 gem 'font-awesome-sass', '~> 6.5.2'
-
-gem 'uglifier', '>=1.3.0'
-
 gem 'aasm', '~> 5.5.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.20'
@@ -33,7 +23,16 @@ gem 'sqlite3', '~> 1.4', group: :sqlite
 gem 'mysql2', '~> 0.5', group: :mysql
 gem 'pg', '~> 1.1', group: :postgresql
 
-group :assets, :optional => true do
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+gem 'mini_racer', group: :therubyracer
+
+group :assets do
+  gem 'coffee-rails', '~> 5.0.0'
+  gem 'jquery-rails', '~> 4.6'
+  gem 'jquery-ui-rails', '~>7.0.0'
+  gem 'sassc-rails', '~> 2.1.2'
+  gem 'bootstrap-sass', '3.4.1'
+  gem 'uglifier', '>=1.3.0'
   gem 'listen'
   gem 'tolk', '~> 5.0.1'
 end
@@ -52,7 +51,6 @@ end
 group :development, :test, :optional => true do
   gem 'byebug'
   gem 'rubocop', '~> 1.65'
-  gem 'mini_racer'
 end
 
 group :test, :optional => true do
diff --git a/doc/installation.md b/doc/installation.md
index a3c2712a..2e937f63 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -44,7 +44,7 @@ Tracks container. In future there should be an official image in Docker Hub. You
 1. Get the Tracks code base by either downloading the archive file for the latest releast or cloning it from GitHub.
 2. Run the following command in the Tracks directory to build the image:
 ```
-   $ docker build -t="tracks" .
+   $ docker build -t="tracks" --target=production .
 ```
 
 1. Make sure you have Docker properly installed.
@@ -153,21 +153,21 @@ Tracks is built upon a number of Ruby libraries (known as ‘gems’). The Bundl
   * If you are using SQLite:
 
         ```
-        bundle config set without "development test mysql"
+        bundle config set without mysql postgresql
         bundle install
         ```
 
   * If you are using MySQL:
 
         ```
-        bundle config set without "development test sqlite"
+        bundle config set without sqlite postgresql
         bundle install
         ```
   
   * If you are using PostgreSQL:
 
         ```
-        bundle config set without "development test sqlite mysql"
+        bundle config set without sqlite mysql
         bundle install
         ```
 

From 55050af2cbd5d6bf4405192729885cf51f2e5657 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 18 Jul 2024 23:44:19 +0300
Subject: [PATCH 662/767] Test the builded code, not the one mounted.

---
 test-envs/docker-compose-mysql.yml    | 1 -
 test-envs/docker-compose-postgres.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test-envs/docker-compose-mysql.yml b/test-envs/docker-compose-mysql.yml
index 6982fe3a..7793c6b4 100644
--- a/test-envs/docker-compose-mysql.yml
+++ b/test-envs/docker-compose-mysql.yml
@@ -20,7 +20,6 @@ services:
       DATABASE_USERNAME: root
       DATABASE_PASSWORD_EMPTY: 1
     volumes:
-      - ${VOLUME:-..}:/app:Z
       - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
       - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
     ports:
diff --git a/test-envs/docker-compose-postgres.yml b/test-envs/docker-compose-postgres.yml
index 378d30cf..0bb095fa 100644
--- a/test-envs/docker-compose-postgres.yml
+++ b/test-envs/docker-compose-postgres.yml
@@ -23,7 +23,6 @@ services:
       DATABASE_ENCODING: unicode
       DATABASE_PORT: 5432
     volumes:
-      - ${VOLUME:-..}:/app:Z
       - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
       - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
     ports:

From 13d7a711a420fc487f6dca9c6c33ce7bdc89dd52 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Fri, 19 Jul 2024 00:14:41 +0300
Subject: [PATCH 663/767] Move jquery back to default group

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 59a0a548..6cb7fada 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,8 @@ gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'rails', '~> 6.1'
 
 gem 'font-awesome-sass', '~> 6.5.2'
+gem 'jquery-rails', '~> 4.6'
+gem 'jquery-ui-rails', '~>7.0.0'
 gem 'aasm', '~> 5.5.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.20'
@@ -28,8 +30,6 @@ gem 'mini_racer', group: :therubyracer
 
 group :assets do
   gem 'coffee-rails', '~> 5.0.0'
-  gem 'jquery-rails', '~> 4.6'
-  gem 'jquery-ui-rails', '~>7.0.0'
   gem 'sassc-rails', '~> 2.1.2'
   gem 'bootstrap-sass', '3.4.1'
   gem 'uglifier', '>=1.3.0'

From 50f5a946d469e150404a621ebc8eebd6dfe2b7bc Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Fri, 19 Jul 2024 00:36:42 +0300
Subject: [PATCH 664/767] Don't use old databases in test runs

---
 test-envs/docker-compose-mysql.yml    | 4 ----
 test-envs/docker-compose-postgres.yml | 4 ----
 test-envs/docker-compose-sqlite.yml   | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/test-envs/docker-compose-mysql.yml b/test-envs/docker-compose-mysql.yml
index 7793c6b4..002f5b9e 100644
--- a/test-envs/docker-compose-mysql.yml
+++ b/test-envs/docker-compose-mysql.yml
@@ -5,8 +5,6 @@ services:
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
       MYSQL_DATABASE: ${TRACKS_DB:-tracks}
-    volumes:
-      - db-data:/var/lib/mysql
   web:
     build:
       context: ..
@@ -26,5 +24,3 @@ services:
       - 3000:3000
     depends_on:
       - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-postgres.yml b/test-envs/docker-compose-postgres.yml
index 0bb095fa..52ba2945 100644
--- a/test-envs/docker-compose-postgres.yml
+++ b/test-envs/docker-compose-postgres.yml
@@ -5,8 +5,6 @@ services:
     environment:
       POSTGRES_DB: ${DATABASE_NAME:-tracks}
       POSTGRES_PASSWORD: password
-    volumes:
-      - db-data:/var/lib/postgresql/data
   web:
     build:
       context: ..
@@ -29,5 +27,3 @@ services:
       - 3000:3000
     depends_on:
       - db
-volumes:
-  db-data:
diff --git a/test-envs/docker-compose-sqlite.yml b/test-envs/docker-compose-sqlite.yml
index 374ff3eb..7a04620c 100644
--- a/test-envs/docker-compose-sqlite.yml
+++ b/test-envs/docker-compose-sqlite.yml
@@ -12,7 +12,7 @@ services:
       DATABASE_NAME: "/app/db/db.sqlite"
       DATABASE_TYPE: sqlite3
     volumes:
-      - ${VOLUME:-sqlite}:/app/db:Z
+      - sqlite:/app/db:Z
       - ${VOLUME:-..}/config/database.docker.yml:/app/config/database.yml:Z
       - ${VOLUME:-..}/config/site.docker.yml:/app/config/site.yml:Z
     ports:

From 76d3083e8f6c10f02813b1e7b53f7eb7ac184df9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 00:40:03 +0000
Subject: [PATCH 665/767] Bump mocha from 2.4.0 to 2.4.2

Bumps [mocha](https://github.com/freerange/mocha) from 2.4.0 to 2.4.2.
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v2.4.0...v2.4.2)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d0e75558..c2fb7da0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
       libv8-node (~> 21.7.2.0)
     minitest (5.24.1)
     minitest-stub-const (0.6)
-    mocha (2.4.0)
+    mocha (2.4.2)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
     net-imap (0.4.12)

From a0999e3e453a5a0865033d0dd975a71027620f9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 00:40:25 +0000
Subject: [PATCH 666/767] Bump acts_as_list from 1.2.1 to 1.2.2

Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.2.1 to 1.2.2.
- [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brendon/acts_as_list/compare/v1.2.1...v1.2.2)

---
updated-dependencies:
- dependency-name: acts_as_list
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d0e75558..c768d5fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    acts_as_list (1.2.1)
+    acts_as_list (1.2.2)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
     ast (2.4.2)

From 36f139d8793c049cfa48ea27fb04dbea7f35e645 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Fri, 19 Jul 2024 14:00:19 +0300
Subject: [PATCH 667/767] Update schema.rb for Postgres support

---
 db/schema.rb | 78 +++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index a0b9a251..6e2fb9c3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,30 +2,33 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 2020_08_20_000743) do
 
-  create_table "attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.integer "todo_id"
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "attachments", force: :cascade do |t|
+    t.bigint "todo_id"
     t.string "file_file_name"
     t.string "file_content_type"
-    t.integer "file_file_size"
+    t.bigint "file_file_size"
     t.datetime "file_updated_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["todo_id"], name: "index_attachments_on_todo_id"
   end
 
-  create_table "contexts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "contexts", force: :cascade do |t|
     t.string "name", null: false
-    t.integer "position", default: 0
+    t.integer "position"
     t.integer "user_id", default: 1
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -34,7 +37,7 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["user_id"], name: "index_contexts_on_user_id"
   end
 
-  create_table "dependencies", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "dependencies", force: :cascade do |t|
     t.integer "successor_id", null: false
     t.integer "predecessor_id", null: false
     t.string "relationship_type"
@@ -42,7 +45,7 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["successor_id"], name: "index_dependencies_on_successor_id"
   end
 
-  create_table "notes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "notes", force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "project_id", null: false
     t.text "body"
@@ -52,7 +55,7 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["user_id"], name: "index_notes_on_user_id"
   end
 
-  create_table "open_id_authentication_associations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "open_id_authentication_associations", force: :cascade do |t|
     t.integer "issued"
     t.integer "lifetime"
     t.string "handle"
@@ -61,13 +64,13 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.binary "secret"
   end
 
-  create_table "open_id_authentication_nonces", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "open_id_authentication_nonces", force: :cascade do |t|
     t.integer "timestamp", null: false
     t.string "server_url"
     t.string "salt", null: false
   end
 
-  create_table "preferences", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "preferences", force: :cascade do |t|
     t.integer "user_id", null: false
     t.string "date_format", limit: 40, default: "%d/%m/%Y", null: false
     t.integer "week_starts", default: 0, null: false
@@ -79,9 +82,9 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.integer "refresh", default: 0, null: false
     t.boolean "verbose_action_descriptors", default: false, null: false
     t.boolean "show_hidden_projects_in_sidebar", default: true, null: false
-    t.string "time_zone", default: "London", null: false
+    t.string "time_zone", limit: 255, default: "London", null: false
     t.boolean "show_project_on_todo_done", default: false, null: false
-    t.string "title_date_format", default: "%A, %d %B %Y", null: false
+    t.string "title_date_format", limit: 255, default: "%A, %d %B %Y", null: false
     t.integer "mobile_todos_per_page", default: 6, null: false
     t.string "sms_email"
     t.integer "sms_context_id"
@@ -91,11 +94,11 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["user_id"], name: "index_preferences_on_user_id"
   end
 
-  create_table "projects", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "projects", force: :cascade do |t|
     t.string "name", null: false
-    t.integer "position", default: 0
+    t.integer "position"
     t.integer "user_id", default: 1
-    t.text "description", limit: 16777215
+    t.text "description"
     t.string "state", limit: 20, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -109,12 +112,12 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["user_id"], name: "index_projects_on_user_id"
   end
 
-  create_table "recurring_todos", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "recurring_todos", force: :cascade do |t|
     t.integer "user_id", default: 1
     t.integer "context_id", null: false
     t.integer "project_id"
     t.string "description", null: false
-    t.text "notes", limit: 16777215
+    t.text "notes"
     t.string "state", limit: 20, null: false
     t.datetime "start_from"
     t.string "ends_on"
@@ -133,21 +136,21 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.integer "every_count"
     t.integer "weekday"
     t.datetime "completed_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "show_always"
     t.index ["state"], name: "index_recurring_todos_on_state"
     t.index ["user_id"], name: "index_recurring_todos_on_user_id"
   end
 
-  create_table "sessions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "sessions", force: :cascade do |t|
     t.string "session_id"
     t.text "data"
     t.datetime "updated_at"
-    t.index ["session_id"], name: "sessions_session_id_index"
+    t.index ["session_id"], name: "index_sessions_on_session_id"
   end
 
-  create_table "taggings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "taggings", force: :cascade do |t|
     t.integer "taggable_id"
     t.integer "tag_id"
     t.string "taggable_type"
@@ -156,7 +159,7 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["taggable_id", "taggable_type"], name: "index_taggings_on_taggable_id_and_taggable_type"
   end
 
-  create_table "tags", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "tags", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -164,11 +167,11 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["name"], name: "index_tags_on_name"
   end
 
-  create_table "todos", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "todos", force: :cascade do |t|
     t.integer "context_id", null: false
     t.integer "project_id"
     t.text "description", null: false
-    t.text "notes", limit: 16777215
+    t.text "notes"
     t.datetime "created_at"
     t.datetime "due"
     t.datetime "completed_at"
@@ -177,7 +180,6 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.string "state", limit: 20, null: false
     t.integer "recurring_todo_id"
     t.datetime "updated_at"
-    t.text "rendered_notes", limit: 16777215
     t.index ["context_id"], name: "index_todos_on_context_id"
     t.index ["project_id"], name: "index_todos_on_project_id"
     t.index ["state"], name: "index_todos_on_state"
@@ -186,20 +188,20 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["user_id", "state"], name: "index_todos_on_user_id_and_state"
   end
 
-  create_table "tolk_locales", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "tolk_locales", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.index ["name"], name: "index_tolk_locales_on_name", unique: true
   end
 
-  create_table "tolk_phrases", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "tolk_phrases", force: :cascade do |t|
     t.text "key"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "tolk_translations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "tolk_translations", force: :cascade do |t|
     t.integer "phrase_id"
     t.integer "locale_id"
     t.text "text"
@@ -210,9 +212,9 @@ ActiveRecord::Schema.define(version: 2020_08_20_000743) do
     t.index ["phrase_id", "locale_id"], name: "index_tolk_translations_on_phrase_id_and_locale_id", unique: true
   end
 
-  create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users", force: :cascade do |t|
     t.string "login", limit: 80, null: false
-    t.string "crypted_password", limit: 60
+    t.string "crypted_password", limit: 60, null: false
     t.string "token"
     t.boolean "is_admin", default: false, null: false
     t.string "first_name"

From a9a978c1f84662079ce76d1b227c0ad651edeff1 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Fri, 19 Jul 2024 14:34:54 +0300
Subject: [PATCH 668/767] Fix the installation documentation of postgresql.
 Fixes #2845.

---
 doc/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/installation.md b/doc/installation.md
index 2e937f63..89829c8b 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -142,7 +142,7 @@ You need to create a database and database-user to use with Tracks. For this, yo
 #### PostgreSQL
 
     $ sudo -u postgres psql
-    postgres=# CREATE USER tracks WITH ENCRYPTED PASSWORD 'password-goes-here';
+    postgres=# CREATE ROLE tracks WITH LOGIN NOSUPERUSER INHERIT CREATEDB CREATEROLE NOREPLICATION PASSWORD 'password-goes-here';
     postgres=# CREATE DATABASE tracks OWNER=tracks;
 
 ### Install dependencies

From 3fcdb41fa9e6c2a1ec7f19149b522a1d2514baf0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 00:25:45 +0000
Subject: [PATCH 669/767] Bump stripe from 5.24.0 to 12.3.0

Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.24.0 to 12.3.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.24.0...v12.3.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e9bc84cb..f9c51435 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -313,7 +313,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    stripe (5.24.0)
+    stripe (12.3.0)
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 0d2d89780b7a90d1ac0add92921972e7923469ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 00:33:56 +0000
Subject: [PATCH 670/767] Bump mocha from 2.4.2 to 2.4.3

Bumps [mocha](https://github.com/freerange/mocha) from 2.4.2 to 2.4.3.
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v2.4.2...v2.4.3)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e9bc84cb..b3e8c8e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
       libv8-node (~> 21.7.2.0)
     minitest (5.24.1)
     minitest-stub-const (0.6)
-    mocha (2.4.2)
+    mocha (2.4.3)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
     net-imap (0.4.12)

From a984011ddc0b63fb663a3175567357febb07d326 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 00:32:02 +0000
Subject: [PATCH 671/767] Bump mocha from 2.4.3 to 2.4.4

Bumps [mocha](https://github.com/freerange/mocha) from 2.4.3 to 2.4.4.
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v2.4.3...v2.4.4)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 79558d8d..31302178 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
       libv8-node (~> 21.7.2.0)
     minitest (5.24.1)
     minitest-stub-const (0.6)
-    mocha (2.4.3)
+    mocha (2.4.4)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
     net-imap (0.4.12)

From 49fa90c7a66c0dd62f0d877e44913faba67fc6cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 00:28:45 +0000
Subject: [PATCH 672/767] Bump mocha from 2.4.4 to 2.4.5

Bumps [mocha](https://github.com/freerange/mocha) from 2.4.4 to 2.4.5.
- [Changelog](https://github.com/freerange/mocha/blob/main/RELEASE.md)
- [Commits](https://github.com/freerange/mocha/compare/v2.4.4...v2.4.5)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 31302178..8e16f046 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
       libv8-node (~> 21.7.2.0)
     minitest (5.24.1)
     minitest-stub-const (0.6)
-    mocha (2.4.4)
+    mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
     net-imap (0.4.12)

From 784f8c3009b265fe584aef1d8644f0c45a2503b9 Mon Sep 17 00:00:00 2001
From: gallegonovato 
Date: Mon, 22 Jul 2024 10:34:27 +0000
Subject: [PATCH 673/767] Translated using Weblate (Spanish)

Currently translated at 100.0% (1121 of 1121 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/es/
---
 config/locales/es.yml | 74 +++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 6f008359..2b235861 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -93,14 +93,15 @@ es:
         body: 'Hubo problemas con los campos siguientes:'
         header:
           one: Un error ha impedido que se guarde este %{model}
-          other: '%{count} errores han impedido que se guarden este %{model}'
+          many: '%{count} errores han impedido que se guarden este %{model}'
+          other: ''
   common:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tarea
+      one: tareas
+      many: tarea
       other: tareas
-      zero: tareas
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -113,7 +114,8 @@ es:
     create: Crear
     days_midsentence:
       one: día
-      other: días
+      many: días
+      other: ''
     deferred: pospuestas
     description: Descripción
     drag_handle: ARRASTRAR
@@ -132,9 +134,9 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 1 nota
-      other: "%{count} notas"
-      zero: 0 notas
+      one: 0 notas
+      many: 1 nota
+      other: '%{count} notas'
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -313,40 +315,49 @@ es:
     distance_in_words:
       about_x_hours:
         one: alrededor de 1 hora
-        other: Acerca de %{count} horas
+        many: Acerca de %{count} horas
+        other: ''
       about_x_months:
         one: alrededor de 1 mes
-        other: Acerca de %{count} meses
+        many: Acerca de %{count} meses
+        other: ''
       about_x_years:
         one: alrededor de 1 año
-        other: Acerca de %{count} años
+        many: Acerca de %{count} años
+        other: ''
       almost_x_years:
         one: casi 1 año
-        other: Casi %{count} años
+        many: Casi %{count} años
+        other: ''
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de un minuto
+        one: menos de 1 minuto
+        many: menos de un minuto
         other: menos de %{count} minutos
-        zero: menos de 1 minuto
       less_than_x_seconds:
         one: menos de 1 segundo
+        many: menos de 1 segundo
         other: menos de %{count} segundos
-        zero: menos de 1 segundo
       over_x_years:
         one: más de un año
-        other: en %{count} años
+        many: en %{count} años
+        other: ''
       x_days:
         one: 1 día
-        other: '%{count} días'
+        many: '%{count} días'
+        other: ''
       x_minutes:
         one: 1 minuto
-        other: '%{count} minutos'
+        many: '%{count} minutos'
+        other: ''
       x_months:
         one: 1 mes
-        other: '%{count} meses'
+        many: '%{count} meses'
+        other: ''
       x_seconds:
         one: Un segundo
-        other: '%{count} segundos'
+        many: '%{count} segundos'
+        other: ''
     prompts:
       day: Día
       hour: Hora
@@ -698,7 +709,8 @@ es:
         units:
           byte:
             one: Byte
-            other: Bytes
+            many: Bytes
+            other: ''
           gb: GB
           kb: KB
           mb: MB
@@ -1056,7 +1068,8 @@ es:
     completed_actions_with: Acciones completadas con la lengüeta «%{tag_name}»
     completed_in_archive:
       one: There is one completed action in the archive.
-      other: There are %{count} completed actions in the archive.
+      many: There are %{count} completed actions in the archive.
+      other: ''
     completed_last_day: Completed in the last 24 hours
     completed_last_x_days: Completed in last %{count} days
     completed_recurrence_completed: There is no next action after the recurring action
@@ -1076,7 +1089,8 @@ es:
       due date before deferring.
     defer_x_days:
       one: Defer one day
-      other: Defer %{count} days
+      many: Defer %{count} days
+      other: ''
     deferred_actions_with: Deferred actions with the tag '%{tag_name}'
     deferred_pending_actions: Deferred/pending actions
     deferred_tasks_title: TRACKS::Recordatorio
@@ -1116,7 +1130,8 @@ es:
       due: 'Vence: %{date}'
     has_x_pending:
       one: Tiene una tarea pendiente
-      other: Tiene %{count} tareas pendientes
+      many: Tiene %{count} tareas pendientes
+      other: ''
     hidden_actions: Tareas ocultas
     in_hidden_state: en estado oculto
     in_pending_state: en estado pendiente
@@ -1283,8 +1298,9 @@ es:
     task_list_title: TRACKS::List etiquetadas
     tickler_items_due:
       one: Un elemento de tiquet ahora está vencido - recargue la página para verlo.
-      other: '%{count} elementos de ticket ahora están vencidos - recargue la página
+      many: '%{count} elementos de ticket ahora están vencidos - recargue la página
         para verlos.'
+      other: ''
     to_tickler: al recordatorio
     unable_to_add_dependency: Es imposible añadir dependencia
     unresolved_dependency: 'El valor que ha introducido en el campo de dependencia
@@ -1347,6 +1363,8 @@ es:
     user_created: User created.
     you_have_to_reset_your_password: Usted tiene que restablecer su contraseña
     manage_users_title: TRACKS::Gestión de usuarios
+    create_error: La creación de usuario falló, ¿quizás ya tienes una cuenta aquí?
+    tos_error: ¡Tienes que aceptar los términos del servicio para registrarte!
   will_paginate:
     next_label: Siguiente »
     page_entries_info:
@@ -1354,13 +1372,13 @@ es:
       multi_page_html: Representando %{model} %{from} - %{to} de
         %{count} en el total
       single_page:
-        one: Viendo del 1 %{model}
+        one: No %{model} encontrado
+        many: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
       single_page_html:
-        one: Viendo del 1 %{model}
+        one: No %{model} encontrado
+        many: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
-        zero: No %{model} encontrado
     page_gap: "…"
     previous_label: "« Anterior"
   rest_help:

From c7d81bb79f4625f5a61fd7963bab563b00b25c58 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Tue, 23 Jul 2024 11:32:01 +0000
Subject: [PATCH 674/767] Translated using Weblate (Finnish)

Currently translated at 99.1% (1111 of 1121 strings)

Translation: Tracks/Tracks
Translate-URL: https://hosted.weblate.org/projects/tracks/tracks/fi/
---
 config/locales/fi.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 3c68b79c..008cba69 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,9 +131,8 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: 1 muistiinpano
-      other: "%{count} muistiinpanoa"
-      zero: ei muistiinpanoja
+      one: ei muistiinpanoja
+      other: 1 muistiinpano
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1331,6 +1330,9 @@ fi:
     total_users_count: Sinulla on yhteensä %{count} käyttäjää
     user_created: Käyttäjä luotu.
     you_have_to_reset_your_password: Palauta salasanasi
+    create_error: Tunnuksen luominen epäonnistui, ehkä sinulla on jo käyttäjätunnus
+      täällä?
+    tos_error: Sinun täytyy hyväksyä käyttöehdot rekisteröityäksesi!
   will_paginate:
     next_label: Seuraava →
     page_entries_info:
@@ -1338,13 +1340,11 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
       single_page_html:
-        one: Näytetään 1 %{model}
-        other: Näytetään kaikki %{count} %{model}
-        zero: '%{model} ei löytynyt'
+        one: '%{model} ei löytynyt'
+        other: Näytetään 1 %{model}
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From c23ca0574ec1149993476632ffd66643aec6aac2 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 25 Jul 2024 14:53:04 +0300
Subject: [PATCH 675/767] Fix reflected XSS vulnerability on the stats page

---
 app/views/stats/show_selection_from_chart.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/stats/show_selection_from_chart.html.erb b/app/views/stats/show_selection_from_chart.html.erb
index 29e9dfdb..abe7f04b 100644
--- a/app/views/stats/show_selection_from_chart.html.erb
+++ b/app/views/stats/show_selection_from_chart.html.erb
@@ -4,8 +4,8 @@
     unless @further
 -%>
 <%= raw t('stats.click_to_show_actions_from_week',
-      :link => link_to("here", show_actions_from_chart_path(:id=>"#{params[:id]}_end", :index => params[:index])),
-      :week => params[:index])
+      :link => link_to("here", show_actions_from_chart_path(:id=>"#{params[:id].to_i}_end", :index => params[:index].to_i)),
+      :week => params[:index].to_i)
 -%>
 <%
     end

From d64e1a0fa436ab0762f18dd37c8d5cb40d87e500 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 25 Jul 2024 21:34:12 +0300
Subject: [PATCH 676/767] Fix the plurals as usual

---
 config/locales/es.yml | 70 +++++++++++++++++--------------------------
 config/locales/fi.yml | 15 ++++++----
 2 files changed, 36 insertions(+), 49 deletions(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2b235861..e4dffa6d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -93,15 +93,14 @@ es:
         body: 'Hubo problemas con los campos siguientes:'
         header:
           one: Un error ha impedido que se guarde este %{model}
-          many: '%{count} errores han impedido que se guarden este %{model}'
-          other: ''
+          other: '%{count} errores han impedido que se guarden este %{model}'
   common:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tareas
-      many: tarea
+      one: tarea
       other: tareas
+      zero: tareas
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -114,8 +113,7 @@ es:
     create: Crear
     days_midsentence:
       one: día
-      many: días
-      other: ''
+      other: días
     deferred: pospuestas
     description: Descripción
     drag_handle: ARRASTRAR
@@ -134,9 +132,9 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 0 notas
-      many: 1 nota
+      one: 1 nota
       other: '%{count} notas'
+      zero: 0 notas
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -315,49 +313,40 @@ es:
     distance_in_words:
       about_x_hours:
         one: alrededor de 1 hora
-        many: Acerca de %{count} horas
-        other: ''
+        other: Acerca de %{count} horas
       about_x_months:
         one: alrededor de 1 mes
-        many: Acerca de %{count} meses
-        other: ''
+        other: Acerca de %{count} meses
       about_x_years:
         one: alrededor de 1 año
-        many: Acerca de %{count} años
-        other: ''
+        other: Acerca de %{count} años
       almost_x_years:
         one: casi 1 año
-        many: Casi %{count} años
-        other: ''
+        other: Casi %{count} años
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de 1 minuto
-        many: menos de un minuto
+        one: menos de un minuto
         other: menos de %{count} minutos
+        zero: menos de 1 minuto
       less_than_x_seconds:
         one: menos de 1 segundo
-        many: menos de 1 segundo
         other: menos de %{count} segundos
+        zero: menos de 1 segundo
       over_x_years:
         one: más de un año
-        many: en %{count} años
-        other: ''
+        other: en %{count} años
       x_days:
         one: 1 día
-        many: '%{count} días'
-        other: ''
+        other: '%{count} días'
       x_minutes:
         one: 1 minuto
-        many: '%{count} minutos'
-        other: ''
+        other: '%{count} minutos'
       x_months:
         one: 1 mes
-        many: '%{count} meses'
-        other: ''
+        other: '%{count} meses'
       x_seconds:
         one: Un segundo
-        many: '%{count} segundos'
-        other: ''
+        other: '%{count} segundos'
     prompts:
       day: Día
       hour: Hora
@@ -709,8 +698,7 @@ es:
         units:
           byte:
             one: Byte
-            many: Bytes
-            other: ''
+            other: Bytes
           gb: GB
           kb: KB
           mb: MB
@@ -1068,8 +1056,7 @@ es:
     completed_actions_with: Acciones completadas con la lengüeta «%{tag_name}»
     completed_in_archive:
       one: There is one completed action in the archive.
-      many: There are %{count} completed actions in the archive.
-      other: ''
+      other: There are %{count} completed actions in the archive.
     completed_last_day: Completed in the last 24 hours
     completed_last_x_days: Completed in last %{count} days
     completed_recurrence_completed: There is no next action after the recurring action
@@ -1089,8 +1076,7 @@ es:
       due date before deferring.
     defer_x_days:
       one: Defer one day
-      many: Defer %{count} days
-      other: ''
+      other: Defer %{count} days
     deferred_actions_with: Deferred actions with the tag '%{tag_name}'
     deferred_pending_actions: Deferred/pending actions
     deferred_tasks_title: TRACKS::Recordatorio
@@ -1130,8 +1116,7 @@ es:
       due: 'Vence: %{date}'
     has_x_pending:
       one: Tiene una tarea pendiente
-      many: Tiene %{count} tareas pendientes
-      other: ''
+      other: Tiene %{count} tareas pendientes
     hidden_actions: Tareas ocultas
     in_hidden_state: en estado oculto
     in_pending_state: en estado pendiente
@@ -1298,9 +1283,8 @@ es:
     task_list_title: TRACKS::List etiquetadas
     tickler_items_due:
       one: Un elemento de tiquet ahora está vencido - recargue la página para verlo.
-      many: '%{count} elementos de ticket ahora están vencidos - recargue la página
+      other: '%{count} elementos de ticket ahora están vencidos - recargue la página
         para verlos.'
-      other: ''
     to_tickler: al recordatorio
     unable_to_add_dependency: Es imposible añadir dependencia
     unresolved_dependency: 'El valor que ha introducido en el campo de dependencia
@@ -1372,13 +1356,13 @@ es:
       multi_page_html: Representando %{model} %{from} - %{to} de
         %{count} en el total
       single_page:
-        one: No %{model} encontrado
-        many: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
       single_page_html:
-        one: No %{model} encontrado
-        many: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
         other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
     page_gap: "…"
     previous_label: "« Anterior"
   rest_help:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 008cba69..6286ad2e 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,8 +131,9 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: ei muistiinpanoja
-      other: 1 muistiinpano
+      one: 1 muistiinpano
+      other: '%{count} muistiinpanoa'
+      zero: ei muistiinpanoja
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1340,11 +1341,13 @@ fi:
       multi_page_html: Näytetään %{model} %{from} - %{to} yhteensä
         %{count} tietueesta
       single_page:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
       single_page_html:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
     page_gap: "…"
     previous_label: "← Edellinen"
   auth_type:

From b0d288d2efd0f8020d04ca95b8e0738a9eab6c51 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki 
Date: Thu, 25 Jul 2024 15:34:44 +0300
Subject: [PATCH 677/767] Fix reflected XSS vulnerabilities in some views

---
 app/controllers/todos_controller.rb    |  6 ++++--
 app/views/layouts/application.html.erb | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 1c852420..05b7a95a 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -863,8 +863,10 @@ class TodosController < ApplicationController
     end
 
     @single_tag = @tag_expr.size == 1 && @tag_expr[0].size == 1
-    @tag_name = @tag_expr[0][0]
-    @tag_title = @single_tag ? @tag_name : tag_title(@tag_expr)
+
+    # These are used in the templates, sanitise to prevent XSS.
+    @tag_name = sanitize(@tag_expr[0][0])
+    @tag_title = sanitize(@single_tag ? @tag_name : tag_title(@tag_expr))
   end
 
   def filter_format_for_tag_view
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 31e5808e..4640637a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,14 +7,14 @@
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>