diff --git a/CHANGELOG.md b/CHANGELOG.md index 55e5eb9752..43c0bf098b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Unreleased +- Add API V2 from DMPonline [#3587](https://github.com/DMPRoadmap/roadmap/pull/3587) + - Add complete plan flag to V2 API [#3595](https://github.com/DMPRoadmap/roadmap/pull/3595) +- chore(deps): `bundle update && yarn upgrade` and bump `node-version` in workflows [#3601](https://github.com/DMPRoadmap/roadmap/pull/3601) +- Update `database.yml.sample`: add separate test db [#3521](https://github.com/DMPRoadmap/roadmap/pull/3521) +- Patch inactive user issue in V2 API [#3610](https://github.com/DMPRoadmap/roadmap/pull/3610) + ## v6.0.1 Security and maintenance release with regression coverage and compatibility diff --git a/Gemfile b/Gemfile index 5929beab5c..4e538d602e 100644 --- a/Gemfile +++ b/Gemfile @@ -83,6 +83,8 @@ gem 'devise', '~> 5.0' # An invitation strategy for Devise (https://github.com/scambra/devise_invitable) gem 'devise_invitable' +gem 'doorkeeper' + # A generalized Rack framework for multiple-provider authentication. # (https://github.com/omniauth/omniauth) gem 'omniauth' diff --git a/Gemfile.lock b/Gemfile.lock index 08bc08896e..5c584796cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,738 +1,741 @@ -GEM - remote: https://rubygems.org/ - specs: - action_text-trix (2.1.19) - railties - actioncable (8.1.4) - actionpack (= 8.1.4) - activesupport (= 8.1.4) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - zeitwerk (~> 2.6) - actionmailbox (8.1.4) - actionpack (= 8.1.4) - activejob (= 8.1.4) - activerecord (= 8.1.4) - activestorage (= 8.1.4) - activesupport (= 8.1.4) - mail (>= 2.8.0) - actionmailer (8.1.4) - actionpack (= 8.1.4) - actionview (= 8.1.4) - activejob (= 8.1.4) - activesupport (= 8.1.4) - mail (>= 2.8.0) - rails-dom-testing (~> 2.2) - actionpack (8.1.4) - actionview (= 8.1.4) - activesupport (= 8.1.4) - nokogiri (>= 1.8.5) - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - useragent (~> 0.16) - actiontext (8.1.4) - action_text-trix (~> 2.1.15) - actionpack (= 8.1.4) - activerecord (= 8.1.4) - activestorage (= 8.1.4) - activesupport (= 8.1.4) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) - actionview (8.1.4) - activesupport (= 8.1.4) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activejob (8.1.4) - activesupport (= 8.1.4) - globalid (>= 0.3.6) - activemodel (8.1.4) - activesupport (= 8.1.4) - activerecord (8.1.4) - activemodel (= 8.1.4) - activesupport (= 8.1.4) - timeout (>= 0.4.0) - activerecord_json_validator (3.1.0) - activerecord (>= 4.2.0, < 9) - json_schemer (~> 2.2) - activestorage (8.1.4) - actionpack (= 8.1.4) - activejob (= 8.1.4) - activerecord (= 8.1.4) - activesupport (= 8.1.4) - marcel (~> 1.0) - activesupport (8.1.4) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.3.1) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - json - logger (>= 1.4.2) - minitest (>= 5.1) - securerandom (>= 0.3) - tzinfo (~> 2.0, >= 2.0.5) - uri (>= 0.13.1) - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - annotate_gem (0.0.14) - bundler (>= 1.1) - annotaterb (4.24.0) - activerecord (>= 6.0.0) - activesupport (>= 6.0.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - api-pagination (7.1.0) - ast (2.4.3) - auth-sanitizer (0.2.3) - version_gem (~> 1.1, >= 1.1.14) - autoprefixer-rails (10.4.21.0) - execjs (~> 2) - base64 (0.3.0) - bcrypt (3.1.22) - better_errors (2.10.1) - erubi (>= 1.0.0) - rack (>= 0.9.0) - rouge (>= 1.0.0) - bigdecimal (4.1.3) - bindex (0.8.1) - binding_of_caller (2.0.0) - debug_inspector (>= 1.2.0) - bootsnap (1.26.0) - msgpack (~> 1.5) - brakeman (8.1.0) - racc - builder (3.3.0) - bullet (8.2.0) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.11) - bundle-audit (0.2.0) - bundler-audit - bundler-audit (0.9.3) - bundler (>= 1.2.0) - thor (~> 1.0) - byebug (13.0.0) - reline (>= 0.6.0) - capybara (3.40.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.11) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - claide (1.1.0) - claide-plugins (0.9.2) - cork - nap - open4 (~> 1.3) - coderay (1.1.3) - colored2 (3.1.2) - concurrent-ruby (1.3.8) - connection_pool (3.0.2) - contact_us (1.2.0) - rails (>= 4.2.0) - cork (0.3.0) - colored2 (~> 3.1) - crack (1.0.1) - bigdecimal - rexml - crass (1.0.7) - cssbundling-rails (1.4.3) - railties (>= 6.0.0) - csv (3.3.6) - danger (9.6.1) - base64 (~> 0.2) - claide (~> 1.0) - claide-plugins (>= 0.9.2) - colored2 (>= 3.1, < 5) - cork (~> 0.1) - faraday (>= 0.9.0, < 3.0) - faraday-http-cache (~> 2.0) - git (>= 1.13) - kramdown (>= 2.5.1, < 3.0) - kramdown-parser-gfm (~> 1.0) - octokit (>= 4.0) - pstore (~> 0.1) - terminal-table (>= 1, < 5) - database_cleaner (2.1.0) - database_cleaner-active_record (>= 2, < 3) - database_cleaner-active_record (2.2.2) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0) - database_cleaner-core (2.1.0) - date (3.5.1) - debug_inspector (1.2.0) - devise (5.0.4) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 7.0) - responders - warden (~> 1.2.3) - devise_invitable (2.0.14) - actionmailer (>= 5.0) - devise (>= 4.6) - diff-lcs (1.6.2) - dotenv (3.2.0) - dotenv-rails (3.2.0) - dotenv (= 3.2.0) - railties (>= 6.1) - dragonfly (1.4.2) - addressable (~> 2.3) - multi_json (~> 1.0) - ostruct (~> 0.6.1) - rack (>= 1.3) - dragonfly-s3_data_store (1.3.0) - dragonfly (~> 1.0) - fog-aws - drb (2.2.3) - erb (6.0.7) - erubi (1.13.1) - excon (1.7.2) - logger - execjs (2.10.2) - json (>= 2) - factory_bot (6.6.0) - activesupport (>= 6.1.0) - factory_bot_rails (6.5.1) - factory_bot (~> 6.5) - railties (>= 6.1.0) - faker (3.8.0) - i18n (>= 1.8.11, < 2) - faraday (2.14.4) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-http-cache (2.8.0) - faraday (>= 0.8) - faraday-net_http (3.4.4) - net-http (~> 0.5) - ffi (1.17.4-aarch64-linux-gnu) - ffi (1.17.4-arm64-darwin) - ffi (1.17.4-x86_64-linux-gnu) - fiddle (1.1.8) - flag_shih_tzu (1.0.6) - version_gem (~> 1.1, >= 1.1.15) - fog-aws (3.33.4) - base64 (>= 0.2, < 0.4) - fog-core (~> 2.6) - fog-json (~> 1.1) - fog-xml (~> 0.1) - fog-core (2.6.0) - builder - excon (~> 1.0) - formatador (>= 0.2, < 2.0) - mime-types - fog-json (1.5.0) - fog-core - json (>= 2.19, < 4) - fog-xml (0.1.5) - fog-core - nokogiri (>= 1.5.11, < 2.0.0) - formatador (1.2.3) - reline - forwardable (1.4.0) - fuubar (2.5.1) - rspec-core (~> 3.0) - ruby-progressbar (~> 1.4) - gettext (3.4.9) - erubi - locale (>= 2.0.5) - prime - racc - text (>= 1.3.0) - git (5.6.0) - activesupport (>= 5.0) - addressable (~> 2.8) - process_executer (~> 4.1) - rchardet (~> 1.9) - globalid (1.4.0) - activesupport (>= 6.1) - guard (2.20.2) - formatador (>= 0.2.4) - listen (>= 2.7, < 4.0) - logger (~> 1.6) - lumberjack (>= 1.0.12, < 2.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.13.0) - shellany (~> 0.0) - thor (>= 0.18.1) - hana (1.3.7) - hashdiff (1.2.1) - hashie (5.1.0) - logger - highline (3.1.2) - reline - htmltoword (1.1.1) - actionpack - nokogiri - rubyzip (>= 1.0) - httparty (0.24.3) - csv - mini_mime (>= 1.0.0) - multi_xml (>= 0.5.2) - i18n (1.15.2) - concurrent-ruby (~> 1.0) - io-console (0.9.4) - irb (1.18.0) - pp (>= 0.6.0) - prism (>= 1.3.0) - rdoc (>= 4.0.0) - reline (>= 0.4.2) - jbuilder (2.15.1) - actionview (>= 7.0.0) - activesupport (>= 7.0.0) - jsbundling-rails (1.3.1) - railties (>= 6.0.0) - json (2.21.2) - json_schemer (2.5.0) - bigdecimal - hana (~> 1.3) - regexp_parser (~> 2.0) - simpleidn (~> 0.2) - jwt (3.3.0) - base64 - kaminari (1.2.2) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.2) - kaminari-activerecord (= 1.2.2) - kaminari-core (= 1.2.2) - kaminari-actionview (1.2.2) - actionview - kaminari-core (= 1.2.2) - kaminari-activerecord (1.2.2) - activerecord - kaminari-core (= 1.2.2) - kaminari-core (1.2.2) - kramdown (2.5.2) - rexml (>= 3.4.4) - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - language_server-protocol (3.17.0.6) - ledermann-rails-settings (2.6.2) - activerecord (>= 6.1) - lint_roller (1.1.0) - listen (3.10.1) - logger - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - locale (2.1.5) - fiddle - logger (1.7.0) - loofah (2.25.2) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - lumberjack (1.4.2) - mail (2.9.1) - logger - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.2.1) - matrix (0.4.3) - method_source (1.1.0) - mime-types (3.7.0) - logger - mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2026.0929) - mini_mime (1.1.5) - minitest (6.0.6) - drb (~> 2.0) - prism (~> 1.5) - mocha (3.1.0) - ruby2_keywords (>= 0.0.5) - msgpack (1.8.5) - multi_json (1.21.2) - multi_xml (0.9.1) - bigdecimal (>= 3.1, < 5) - mysql2 (0.5.7) - bigdecimal - nap (1.1.0) - nenv (0.3.0) - net-http (0.9.1) - uri (>= 0.11.1) - net-imap (0.6.7) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.4.0) - timeout - net-smtp (0.5.2) - net-protocol - nio4r (2.7.5) - nokogiri (1.19.4-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.19.4-arm64-darwin) - racc (~> 1.4) - nokogiri (1.19.4-x86_64-linux-gnu) - racc (~> 1.4) - notiffany (0.1.3) - nenv (~> 0.1) - shellany (~> 0.0) - oauth2 (2.0.25) - anonymous_loader (~> 0.1, >= 0.1.3) - auth-sanitizer (~> 0.2, >= 0.2.3) - faraday (>= 0.17.3, < 4.0) - jwt (>= 1.0, < 4.0) - logger (~> 1.2) - multi_xml (~> 0.5) - rack (>= 1.2, < 4) - snaky_hash (~> 2.0, >= 2.0.7) - version_gem (~> 1.1, >= 1.1.14) - octokit (10.0.0) - faraday (>= 1, < 3) - sawyer (~> 0.9) - omniauth (2.1.4) - hashie (>= 3.4.6) - logger - rack (>= 2.2.3) - rack-protection - omniauth-oauth2 (1.9.0) - oauth2 (>= 2.0.2, < 3) - omniauth (~> 2.0) - omniauth-orcid (2.1.1) - omniauth-oauth2 (~> 1.3) - ruby_dig (~> 0.0.2) - omniauth-rails_csrf_protection (2.0.1) - actionpack (>= 4.2) - omniauth (~> 2.0) - omniauth-shibboleth (1.3.0) - omniauth (>= 1.0.0) - open4 (1.3.4) - options (2.3.2) - orm_adapter (0.5.0) - ostruct (0.6.3) - parallel (1.28.0) - parser (3.3.12.0) - ast (~> 2.4.1) - racc - pg (1.7.0-aarch64-linux) - pg (1.7.0-arm64-darwin) - pg (1.7.0-x86_64-linux) - pp (0.6.4) - prettyprint - prettyprint (0.2.0) - prime (0.1.4) - forwardable - singleton - prism (1.9.0) - process_executer (4.1.1) - track_open_instances (~> 0.1) - progress_bar (1.3.4) - highline (>= 1.6) - options (~> 2.3.0) - pry (0.16.0) - coderay (~> 1.1) - method_source (~> 1.0) - reline (>= 0.6.0) - pstore (0.2.1) - public_suffix (7.0.5) - puma (8.0.2) - nio4r (~> 2.0) - pundit (2.5.2) - activesupport (>= 3.0.0) - pundit-matchers (4.0.0) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) - racc (1.8.1) - rack (3.2.7) - rack-attack (6.8.0) - rack (>= 1.0, < 4) - rack-mini-profiler (5.0.0) - rack (>= 1.2.0) - rack-protection (4.2.1) - base64 (>= 0.1.0) - logger (>= 1.6.0) - rack (>= 3.0.0, < 4) - rack-session (2.1.2) - base64 (>= 0.1.0) - rack (>= 3.0.0) - rack-test (2.2.0) - rack (>= 1.3) - rackup (2.3.1) - rack (>= 3) - rails (8.1.4) - actioncable (= 8.1.4) - actionmailbox (= 8.1.4) - actionmailer (= 8.1.4) - actionpack (= 8.1.4) - actiontext (= 8.1.4) - actionview (= 8.1.4) - activejob (= 8.1.4) - activemodel (= 8.1.4) - activerecord (= 8.1.4) - activestorage (= 8.1.4) - activesupport (= 8.1.4) - bundler (>= 1.15.0) - railties (= 8.1.4) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.3.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.7.1) - loofah (~> 2.25, >= 2.25.2) - nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.1.4) - actionpack (= 8.1.4) - activesupport (= 8.1.4) - irb (~> 1.13) - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - tsort (>= 0.2) - zeitwerk (~> 2.6) - rainbow (3.1.1) - rake (13.4.2) - rb-fsevent (0.11.2) - rb-inotify (0.11.1) - ffi (~> 1.0) - rbs (4.2.0) - logger - prism (>= 1.6.0) - tsort - rchardet (1.10.2) - rdoc (8.1.0) - erb - prism (>= 1.6.0) - rbs (>= 4.0.0) - tsort - recaptcha (5.21.2) - regexp_parser (2.13.1) - reline (0.7.0) - io-console (~> 0.5) - responders (3.2.1) - actionpack (>= 7.0) - railties (>= 7.0) - rexml (3.4.4) - rollbar (3.8.0) - rouge (5.1.0) - strscan (~> 3.1) - rspec-collection_matchers (1.2.1) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.13.6) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.5) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.8) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-rails (8.0.4) - actionpack (>= 7.2) - activesupport (>= 7.2) - railties (>= 7.2) - rspec-core (>= 3.13.0, < 5.0.0) - rspec-expectations (>= 3.13.0, < 5.0.0) - rspec-mocks (>= 3.13.0, < 5.0.0) - rspec-support (>= 3.13.0, < 5.0.0) - rspec-support (3.13.7) - rubocop (1.81.7) - json (~> 2.3) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.1.0) - parallel (~> 1.10) - parser (>= 3.3.0.2) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.47.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.50.0) - parser (>= 3.3.7.2) - prism (~> 1.7) - rubocop-i18n (3.3.0) - lint_roller (~> 1.1) - rubocop (>= 1.72.1) - rubocop-performance (1.26.1) - lint_roller (~> 1.1) - rubocop (>= 1.75.0, < 2.0) - rubocop-ast (>= 1.47.1, < 2.0) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - ruby_dig (0.0.2) - rubyzip (3.7.0) - sawyer (0.9.3) - addressable (>= 2.3.5) - faraday (>= 0.17.3, < 3) - securerandom (0.4.1) - selenium-webdriver (4.50.0) - base64 (~> 0.2) - logger (~> 1.4) - rubyzip (>= 1.2.2, < 4.0) - websocket (~> 1.0) - shellany (0.0.1) - shoulda (4.0.0) - shoulda-context (~> 2.0) - shoulda-matchers (~> 4.0) - shoulda-context (2.0.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) - simpleidn (0.3.0) - singleton (0.3.0) - snaky_hash (2.0.7) - hashie (>= 0.1.0, < 6) - version_gem (~> 1.1, >= 1.1.14) - sprockets (4.4.1) - concurrent-ruby (~> 1.1) - logger - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) - strscan (3.1.8) - terminal-table (4.0.0) - unicode-display_width (>= 1.1.1, < 4) - text (1.3.1) - thor (1.5.0) - timeout (0.6.1) - tomparse (0.4.2) - track_open_instances (0.1.15) - translation (1.41) - gettext (~> 3.2, >= 3.2.5, <= 3.4.9) - tsort (0.2.0) - turbo-rails (2.0.23) - actionpack (>= 7.1.0) - railties (>= 7.1.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (3.3.0) - unicode-emoji (~> 4.3) - unicode-emoji (4.3.0) - uniform_notifier (1.18.0) - uri (1.1.1) - useragent (0.16.11) - version_gem (1.1.15) - warden (1.2.9) - rack (>= 2.0.9) - web-console (4.3.0) - actionview (>= 8.0.0) - bindex (>= 0.4.0) - railties (>= 8.0.0) - webmock (3.26.4) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - websocket (1.2.11) - websocket-driver (0.8.2) - base64 - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - wicked_pdf (2.8.2) - activesupport - ostruct - wkhtmltopdf-binary (0.12.6.10) - xpath (3.2.0) - nokogiri (~> 1.8) - yard (0.9.45) - yard-tomdoc (0.7.1) - tomparse (>= 0.4.0) - yard - zeitwerk (2.8.3) - -PLATFORMS - aarch64-linux - arm64-darwin-21 - arm64-darwin-22 - arm64-darwin-25 - x86_64-linux - -DEPENDENCIES - activerecord_json_validator - annotate_gem - annotaterb (~> 4.24.0) - api-pagination - autoprefixer-rails - better_errors - binding_of_caller - bootsnap - brakeman - bullet - bundle-audit - byebug - capybara - contact_us - cssbundling-rails - csv - danger - database_cleaner - devise (~> 5.0) - devise_invitable - dotenv-rails - dragonfly - dragonfly-s3_data_store - factory_bot_rails - faker - flag_shih_tzu - fuubar - guard - htmltoword - httparty - jbuilder (~> 2.15) - jsbundling-rails - jwt - kaminari - ledermann-rails-settings - listen - logger (~> 1.7) - mail - mocha - mysql2 - net-imap (~> 0.5) - net-pop (~> 0.1) - net-smtp (~> 0.5) - omniauth - omniauth-orcid - omniauth-rails_csrf_protection - omniauth-shibboleth - parallel - pg - progress_bar - puma - pundit - pundit-matchers - rack-attack (~> 6.6, >= 6.6.1) - rack-mini-profiler - rails (~> 8.1.0) - rails-controller-testing - rake (~> 13.4) - recaptcha - rollbar - rspec-collection_matchers - rspec-rails (~> 8.0) - rubocop (~> 1.81.0) - rubocop-i18n - rubocop-performance (~> 1.26.0) - selenium-webdriver (~> 4.25) - shoulda - sprockets-rails - text - translation - turbo-rails (~> 2.0) - web-console - webmock - wicked_pdf - wkhtmltopdf-binary - yard - yard-tomdoc - -RUBY VERSION - ruby 3.4.11p137 - -BUNDLED WITH - 2.7.2 +GEM + remote: https://rubygems.org/ + specs: + action_text-trix (2.1.19) + railties + actioncable (8.1.4) + actionpack (= 8.1.4) + activesupport (= 8.1.4) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (8.1.4) + actionpack (= 8.1.4) + activejob (= 8.1.4) + activerecord (= 8.1.4) + activestorage (= 8.1.4) + activesupport (= 8.1.4) + mail (>= 2.8.0) + actionmailer (8.1.4) + actionpack (= 8.1.4) + actionview (= 8.1.4) + activejob (= 8.1.4) + activesupport (= 8.1.4) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (8.1.4) + actionview (= 8.1.4) + activesupport (= 8.1.4) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (8.1.4) + action_text-trix (~> 2.1.15) + actionpack (= 8.1.4) + activerecord (= 8.1.4) + activestorage (= 8.1.4) + activesupport (= 8.1.4) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (8.1.4) + activesupport (= 8.1.4) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (8.1.4) + activesupport (= 8.1.4) + globalid (>= 0.3.6) + activemodel (8.1.4) + activesupport (= 8.1.4) + activerecord (8.1.4) + activemodel (= 8.1.4) + activesupport (= 8.1.4) + timeout (>= 0.4.0) + activerecord_json_validator (3.1.0) + activerecord (>= 4.2.0, < 9) + json_schemer (~> 2.2) + activestorage (8.1.4) + actionpack (= 8.1.4) + activejob (= 8.1.4) + activerecord (= 8.1.4) + activesupport (= 8.1.4) + marcel (~> 1.0) + activesupport (8.1.4) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + json + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + annotate_gem (0.0.14) + bundler (>= 1.1) + annotaterb (4.24.0) + activerecord (>= 6.0.0) + activesupport (>= 6.0.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + api-pagination (7.1.0) + ast (2.4.3) + auth-sanitizer (0.2.3) + version_gem (~> 1.1, >= 1.1.14) + autoprefixer-rails (10.4.21.0) + execjs (~> 2) + base64 (0.3.0) + bcrypt (3.1.22) + better_errors (2.10.1) + erubi (>= 1.0.0) + rack (>= 0.9.0) + rouge (>= 1.0.0) + bigdecimal (4.1.3) + bindex (0.8.1) + binding_of_caller (2.0.0) + debug_inspector (>= 1.2.0) + bootsnap (1.26.0) + msgpack (~> 1.5) + brakeman (8.1.0) + racc + builder (3.3.0) + bullet (8.2.0) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.11) + bundle-audit (0.2.0) + bundler-audit + bundler-audit (0.9.3) + bundler (>= 1.2.0) + thor (~> 1.0) + byebug (13.0.0) + reline (>= 0.6.0) + capybara (3.40.0) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.11) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + claide (1.1.0) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) + coderay (1.1.3) + colored2 (3.1.2) + concurrent-ruby (1.3.8) + connection_pool (3.0.2) + contact_us (1.2.0) + rails (>= 4.2.0) + cork (0.3.0) + colored2 (~> 3.1) + crack (1.0.1) + bigdecimal + rexml + crass (1.0.7) + cssbundling-rails (1.4.3) + railties (>= 6.0.0) + csv (3.3.6) + danger (9.6.1) + base64 (~> 0.2) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (>= 3.1, < 5) + cork (~> 0.1) + faraday (>= 0.9.0, < 3.0) + faraday-http-cache (~> 2.0) + git (>= 1.13) + kramdown (>= 2.5.1, < 3.0) + kramdown-parser-gfm (~> 1.0) + octokit (>= 4.0) + pstore (~> 0.1) + terminal-table (>= 1, < 5) + database_cleaner (2.1.0) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.2.2) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0) + database_cleaner-core (2.1.0) + date (3.5.1) + debug_inspector (1.2.0) + devise (5.0.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 7.0) + responders + warden (~> 1.2.3) + devise_invitable (2.0.14) + actionmailer (>= 5.0) + devise (>= 4.6) + diff-lcs (1.6.2) + doorkeeper (5.9.9) + railties (>= 5) + dotenv (3.2.0) + dotenv-rails (3.2.0) + dotenv (= 3.2.0) + railties (>= 6.1) + dragonfly (1.4.2) + addressable (~> 2.3) + multi_json (~> 1.0) + ostruct (~> 0.6.1) + rack (>= 1.3) + dragonfly-s3_data_store (1.3.0) + dragonfly (~> 1.0) + fog-aws + drb (2.2.3) + erb (6.0.7) + erubi (1.13.1) + excon (1.7.2) + logger + execjs (2.10.2) + json (>= 2) + factory_bot (6.6.0) + activesupport (>= 6.1.0) + factory_bot_rails (6.5.1) + factory_bot (~> 6.5) + railties (>= 6.1.0) + faker (3.8.0) + i18n (>= 1.8.11, < 2) + faraday (2.14.4) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-http-cache (2.8.0) + faraday (>= 0.8) + faraday-net_http (3.4.4) + net-http (~> 0.5) + ffi (1.17.4-aarch64-linux-gnu) + ffi (1.17.4-arm64-darwin) + ffi (1.17.4-x86_64-linux-gnu) + fiddle (1.1.8) + flag_shih_tzu (1.0.6) + version_gem (~> 1.1, >= 1.1.15) + fog-aws (3.33.4) + base64 (>= 0.2, < 0.4) + fog-core (~> 2.6) + fog-json (~> 1.1) + fog-xml (~> 0.1) + fog-core (2.6.0) + builder + excon (~> 1.0) + formatador (>= 0.2, < 2.0) + mime-types + fog-json (1.5.0) + fog-core + json (>= 2.19, < 4) + fog-xml (0.1.5) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) + formatador (1.2.3) + reline + forwardable (1.4.0) + fuubar (2.5.1) + rspec-core (~> 3.0) + ruby-progressbar (~> 1.4) + gettext (3.4.9) + erubi + locale (>= 2.0.5) + prime + racc + text (>= 1.3.0) + git (5.6.0) + activesupport (>= 5.0) + addressable (~> 2.8) + process_executer (~> 4.1) + rchardet (~> 1.9) + globalid (1.4.0) + activesupport (>= 6.1) + guard (2.20.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + logger (~> 1.6) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.13.0) + shellany (~> 0.0) + thor (>= 0.18.1) + hana (1.3.7) + hashdiff (1.2.1) + hashie (5.1.0) + logger + highline (3.1.2) + reline + htmltoword (1.1.1) + actionpack + nokogiri + rubyzip (>= 1.0) + httparty (0.24.3) + csv + mini_mime (>= 1.0.0) + multi_xml (>= 0.5.2) + i18n (1.15.2) + concurrent-ruby (~> 1.0) + io-console (0.9.4) + irb (1.18.0) + pp (>= 0.6.0) + prism (>= 1.3.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jbuilder (2.15.1) + actionview (>= 7.0.0) + activesupport (>= 7.0.0) + jsbundling-rails (1.3.1) + railties (>= 6.0.0) + json (2.21.2) + json_schemer (2.5.0) + bigdecimal + hana (~> 1.3) + regexp_parser (~> 2.0) + simpleidn (~> 0.2) + jwt (3.3.0) + base64 + kaminari (1.2.2) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) + actionview + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) + activerecord + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + kramdown (2.5.2) + rexml (>= 3.4.4) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + language_server-protocol (3.17.0.6) + ledermann-rails-settings (2.6.2) + activerecord (>= 6.1) + lint_roller (1.1.0) + listen (3.10.1) + logger + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + locale (2.1.5) + fiddle + logger (1.7.0) + loofah (2.25.2) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + lumberjack (1.4.2) + mail (2.9.1) + logger + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.2.1) + matrix (0.4.3) + method_source (1.1.0) + mime-types (3.7.0) + logger + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2026.0929) + mini_mime (1.1.5) + minitest (6.0.6) + drb (~> 2.0) + prism (~> 1.5) + mocha (3.1.0) + ruby2_keywords (>= 0.0.5) + msgpack (1.8.5) + multi_json (1.21.2) + multi_xml (0.9.1) + bigdecimal (>= 3.1, < 5) + mysql2 (0.5.7) + bigdecimal + nap (1.1.0) + nenv (0.3.0) + net-http (0.9.1) + uri (>= 0.11.1) + net-imap (0.6.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.4.0) + timeout + net-smtp (0.5.2) + net-protocol + nio4r (2.7.5) + nokogiri (1.19.4-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.19.4-arm64-darwin) + racc (~> 1.4) + nokogiri (1.19.4-x86_64-linux-gnu) + racc (~> 1.4) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + oauth2 (2.0.25) + anonymous_loader (~> 0.1, >= 0.1.3) + auth-sanitizer (~> 0.2, >= 0.2.3) + faraday (>= 0.17.3, < 4.0) + jwt (>= 1.0, < 4.0) + logger (~> 1.2) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0, >= 2.0.7) + version_gem (~> 1.1, >= 1.1.14) + octokit (10.0.0) + faraday (>= 1, < 3) + sawyer (~> 0.9) + omniauth (2.1.4) + hashie (>= 3.4.6) + logger + rack (>= 2.2.3) + rack-protection + omniauth-oauth2 (1.9.0) + oauth2 (>= 2.0.2, < 3) + omniauth (~> 2.0) + omniauth-orcid (2.1.1) + omniauth-oauth2 (~> 1.3) + ruby_dig (~> 0.0.2) + omniauth-rails_csrf_protection (2.0.1) + actionpack (>= 4.2) + omniauth (~> 2.0) + omniauth-shibboleth (1.3.0) + omniauth (>= 1.0.0) + open4 (1.3.4) + options (2.3.2) + orm_adapter (0.5.0) + ostruct (0.6.3) + parallel (1.28.0) + parser (3.3.12.0) + ast (~> 2.4.1) + racc + pg (1.7.0-aarch64-linux) + pg (1.7.0-arm64-darwin) + pg (1.7.0-x86_64-linux) + pp (0.6.4) + prettyprint + prettyprint (0.2.0) + prime (0.1.4) + forwardable + singleton + prism (1.9.0) + process_executer (4.1.1) + track_open_instances (~> 0.1) + progress_bar (1.3.4) + highline (>= 1.6) + options (~> 2.3.0) + pry (0.16.0) + coderay (~> 1.1) + method_source (~> 1.0) + reline (>= 0.6.0) + pstore (0.2.1) + public_suffix (7.0.5) + puma (8.0.2) + nio4r (~> 2.0) + pundit (2.5.2) + activesupport (>= 3.0.0) + pundit-matchers (4.0.0) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + racc (1.8.1) + rack (3.2.7) + rack-attack (6.8.0) + rack (>= 1.0, < 4) + rack-mini-profiler (5.0.0) + rack (>= 1.2.0) + rack-protection (4.2.1) + base64 (>= 0.1.0) + logger (>= 1.6.0) + rack (>= 3.0.0, < 4) + rack-session (2.1.2) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.2.0) + rack (>= 1.3) + rackup (2.3.1) + rack (>= 3) + rails (8.1.4) + actioncable (= 8.1.4) + actionmailbox (= 8.1.4) + actionmailer (= 8.1.4) + actionpack (= 8.1.4) + actiontext (= 8.1.4) + actionview (= 8.1.4) + activejob (= 8.1.4) + activemodel (= 8.1.4) + activerecord (= 8.1.4) + activestorage (= 8.1.4) + activesupport (= 8.1.4) + bundler (>= 1.15.0) + railties (= 8.1.4) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.7.1) + loofah (~> 2.25, >= 2.25.2) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (8.1.4) + actionpack (= 8.1.4) + activesupport (= 8.1.4) + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.4.2) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + rbs (4.2.0) + logger + prism (>= 1.6.0) + tsort + rchardet (1.10.2) + rdoc (8.1.0) + erb + prism (>= 1.6.0) + rbs (>= 4.0.0) + tsort + recaptcha (5.21.2) + regexp_parser (2.13.1) + reline (0.7.0) + io-console (~> 0.5) + responders (3.2.1) + actionpack (>= 7.0) + railties (>= 7.0) + rexml (3.4.4) + rollbar (3.8.0) + rouge (5.1.0) + strscan (~> 3.1) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.13.6) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.8) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-rails (8.0.4) + actionpack (>= 7.2) + activesupport (>= 7.2) + railties (>= 7.2) + rspec-core (>= 3.13.0, < 5.0.0) + rspec-expectations (>= 3.13.0, < 5.0.0) + rspec-mocks (>= 3.13.0, < 5.0.0) + rspec-support (>= 3.13.0, < 5.0.0) + rspec-support (3.13.7) + rubocop (1.81.7) + json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.47.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.50.0) + parser (>= 3.3.7.2) + prism (~> 1.7) + rubocop-i18n (3.3.0) + lint_roller (~> 1.1) + rubocop (>= 1.72.1) + rubocop-performance (1.26.1) + lint_roller (~> 1.1) + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + ruby_dig (0.0.2) + rubyzip (3.7.0) + sawyer (0.9.3) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + securerandom (0.4.1) + selenium-webdriver (4.50.0) + base64 (~> 0.2) + logger (~> 1.4) + rubyzip (>= 1.2.2, < 4.0) + websocket (~> 1.0) + shellany (0.0.1) + shoulda (4.0.0) + shoulda-context (~> 2.0) + shoulda-matchers (~> 4.0) + shoulda-context (2.0.0) + shoulda-matchers (4.5.1) + activesupport (>= 4.2.0) + simpleidn (0.3.0) + singleton (0.3.0) + snaky_hash (2.0.7) + hashie (>= 0.1.0, < 6) + version_gem (~> 1.1, >= 1.1.14) + sprockets (4.4.1) + concurrent-ruby (~> 1.1) + logger + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) + strscan (3.1.8) + terminal-table (4.0.0) + unicode-display_width (>= 1.1.1, < 4) + text (1.3.1) + thor (1.5.0) + timeout (0.6.1) + tomparse (0.4.2) + track_open_instances (0.1.15) + translation (1.41) + gettext (~> 3.2, >= 3.2.5, <= 3.4.9) + tsort (0.2.0) + turbo-rails (2.0.23) + actionpack (>= 7.1.0) + railties (>= 7.1.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (3.3.0) + unicode-emoji (~> 4.3) + unicode-emoji (4.3.0) + uniform_notifier (1.18.0) + uri (1.1.1) + useragent (0.16.11) + version_gem (1.1.15) + warden (1.2.9) + rack (>= 2.0.9) + web-console (4.3.0) + actionview (>= 8.0.0) + bindex (>= 0.4.0) + railties (>= 8.0.0) + webmock (3.26.4) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + websocket (1.2.11) + websocket-driver (0.8.2) + base64 + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + wicked_pdf (2.8.2) + activesupport + ostruct + wkhtmltopdf-binary (0.12.6.10) + xpath (3.2.0) + nokogiri (~> 1.8) + yard (0.9.45) + yard-tomdoc (0.7.1) + tomparse (>= 0.4.0) + yard + zeitwerk (2.8.3) + +PLATFORMS + aarch64-linux + arm64-darwin-21 + arm64-darwin-22 + arm64-darwin-25 + x86_64-linux + +DEPENDENCIES + activerecord_json_validator + annotate_gem + annotaterb (~> 4.24.0) + api-pagination + autoprefixer-rails + better_errors + binding_of_caller + bootsnap + brakeman + bullet + bundle-audit + byebug + capybara + contact_us + cssbundling-rails + csv + danger + database_cleaner + devise (~> 5.0) + devise_invitable + doorkeeper + dotenv-rails + dragonfly + dragonfly-s3_data_store + factory_bot_rails + faker + flag_shih_tzu + fuubar + guard + htmltoword + httparty + jbuilder (~> 2.15) + jsbundling-rails + jwt + kaminari + ledermann-rails-settings + listen + logger (~> 1.7) + mail + mocha + mysql2 + net-imap (~> 0.5) + net-pop (~> 0.1) + net-smtp (~> 0.5) + omniauth + omniauth-orcid + omniauth-rails_csrf_protection + omniauth-shibboleth + parallel + pg + progress_bar + puma + pundit + pundit-matchers + rack-attack (~> 6.6, >= 6.6.1) + rack-mini-profiler + rails (~> 8.1.0) + rails-controller-testing + rake (~> 13.4) + recaptcha + rollbar + rspec-collection_matchers + rspec-rails (~> 8.0) + rubocop (~> 1.81.0) + rubocop-i18n + rubocop-performance (~> 1.26.0) + selenium-webdriver (~> 4.25) + shoulda + sprockets-rails + text + translation + turbo-rails (~> 2.0) + web-console + webmock + wicked_pdf + wkhtmltopdf-binary + yard + yard-tomdoc + +RUBY VERSION + ruby 3.4.11p137 + +BUNDLED WITH + 2.7.2 diff --git a/Rakefile b/Rakefile index 42f9525d64..16a081e804 100755 --- a/Rakefile +++ b/Rakefile @@ -13,5 +13,6 @@ require_relative 'config/application' DMPRoadmap::Application.load_tasks +Doorkeeper::Rake.load_tasks task default: :test diff --git a/app/controllers/api/v1/base_api_controller.rb b/app/controllers/api/v1/base_api_controller.rb index c1ddc36547..ece2ecafcd 100644 --- a/app/controllers/api/v1/base_api_controller.rb +++ b/app/controllers/api/v1/base_api_controller.rb @@ -114,12 +114,12 @@ def paginate_response(results:) def plan_permitted_params %i[created title description language ethical_issues_exist ethical_issues_description ethical_issues_report] + - [dmp_ids: identifier_permitted_params, - contact: contributor_permitted_params, - contributors: contributor_permitted_params, - costs: cost_permitted_params, - project: project_permitted_params, - datasets: dataset_permitted_params] + [{ dmp_ids: identifier_permitted_params, + contact: contributor_permitted_params, + contributors: contributor_permitted_params, + costs: cost_permitted_params, + project: project_permitted_params, + datasets: dataset_permitted_params }] end def identifier_permitted_params @@ -128,13 +128,13 @@ def identifier_permitted_params def contributor_permitted_params %i[firstname surname mbox role] + - [affiliations: affiliation_permitted_params, - contributor_ids: identifier_permitted_params] + [{ affiliations: affiliation_permitted_params, + contributor_ids: identifier_permitted_params }] end def affiliation_permitted_params %i[name abbreviation] + - [affiliation_ids: identifier_permitted_params] + [{ affiliation_ids: identifier_permitted_params }] end def cost_permitted_params @@ -143,27 +143,27 @@ def cost_permitted_params def project_permitted_params %i[title description start_on end_on] + - [funding: funding_permitted_params] + [{ funding: funding_permitted_params }] end def funding_permitted_params %i[name funding_status] + - [funder_ids: identifier_permitted_params, - grant_ids: identifier_permitted_params] + [{ funder_ids: identifier_permitted_params, + grant_ids: identifier_permitted_params }] end def dataset_permitted_params %i[title description type issued language personal_data sensitive_data keywords data_quality_assurance preservation_statement] + - [dataset_ids: identifier_permitted_params, - metadata: metadatum_permitted_params, - security_and_privacy_statements: security_and_privacy_statement_permitted_params, - technical_resources: technical_resource_permitted_params, - distributions: distribution_permitted_params] + [{ dataset_ids: identifier_permitted_params, + metadata: metadatum_permitted_params, + security_and_privacy_statements: security_and_privacy_statement_permitted_params, + technical_resources: technical_resource_permitted_params, + distributions: distribution_permitted_params }] end def metadatum_permitted_params - %i[description language] + [identifier: identifier_permitted_params] + %i[description language] + [{ identifier: identifier_permitted_params }] end def security_and_privacy_statement_permitted_params @@ -171,13 +171,13 @@ def security_and_privacy_statement_permitted_params end def technical_resource_permitted_params - %i[description] + [identifier: identifier_permitted_params] + %i[description] + [{ identifier: identifier_permitted_params }] end def distribution_permitted_params %i[title description format byte_size access_url download_url data_access available_until] + - [licenses: license_permitted_params, host: host_permitted_params] + [{ licenses: license_permitted_params, host: host_permitted_params }] end def license_permitted_params @@ -187,7 +187,7 @@ def license_permitted_params def host_permitted_params %i[title description supports_versioning backup_type backup_frequency storage_type availability geo_location certified_with pid_system] + - [host_ids: identifier_permitted_params] + [{ host_ids: identifier_permitted_params }] end end end diff --git a/app/controllers/api/v2/base_api_controller.rb b/app/controllers/api/v2/base_api_controller.rb new file mode 100644 index 0000000000..a0c5cefc54 --- /dev/null +++ b/app/controllers/api/v2/base_api_controller.rb @@ -0,0 +1,117 @@ +# frozen_string_literal: true + +module Api + module V2 + class BaseApiController < ApplicationController # rubocop:todo Style/Documentation + # skipping the standard rails authenticity tokens passed in the UI + skip_before_action :verify_authenticity_token + + # call doorkeeper to authorize the request + before_action :doorkeeper_authorize!, except: %i[heartbeat] + # Authorize resource owner, check if the user account associated with the token is active + before_action :authorize_resource_owner, except: %i[heartbeat] + # get details of server (e.g. DMPonline) and client app + before_action :base_response_content + + before_action :log_access + + before_action :require_read_scope, except: %i[heartbeat me] + # controller can respond to json format requests + respond_to :json + + # set up pages in response + before_action :pagination_params, except: %i[heartbeat] + + rescue_from StandardError, with: :handle_exception + + # GET /api/v2/heartbeat + def heartbeat + render '/api/v2/heartbeat' + end + + # GET /me.json - recommended for doorkeeper gem + def me + render json: @resource_owner.slice(:firstname, :surname, :email).merge( + organisation: @resource_owner.org.name, + language: @resource_owner.language&.name + ) + end + + protected + + def render_error(errors:, status:, details: nil) + @payload = { errors: errors, details: details } + render '/api/v2/error', status: status + end + + private + + # define instance variable json and associated getter and setter methods + attr_accessor :json + + def authorize_resource_owner + return unless doorkeeper_token&.resource_owner_id.present? + + @resource_owner = User.find_by(id: doorkeeper_token.resource_owner_id) + + return if @resource_owner.present? && @resource_owner.active? + + render_error(errors: _('User account has been deactivated.'), status: :unauthorized) + end + + def base_response_content + @application = ApplicationService.application_name + @client = doorkeeper_token&.application + @caller = @client&.name || request.remote_ip + end + + def log_access + if @client.present? + Rails.logger.info "Client (OAuth) application name: #{@client.name}" + Rails.logger.info "Client (OAuth) application uid: #{@client.uid}" + end + Rails.logger.info "Resource owner id: #{@resource_owner.id}" if @resource_owner + end + + def handle_exception(exception) + if exception.is_a?(Pundit::NotAuthorizedError) + handle_client_not_authorized + else + handle_internal_server_error(exception) + end + end + + def handle_internal_server_error(exception) + # log server errors + Rails.logger.error "Exception message: #{exception.message}" + Rails.logger.error exception.backtrace.join("\n") if exception.backtrace.present? + + # inform client of server error + render_error(errors: _('There was a problem in the server.'), status: :internal_server_error) + end + + def handle_client_not_authorized + render_error(errors: _('The client is not authorized to perform this action.'), status: :forbidden) + end + + # retrieve the requested pagination params or use defaults + # only allow 100 per page as the max + def pagination_params + max_per_page = Rails.configuration.x.application.api_max_page_size + @page = params.fetch('page', 1).to_i + @per_page = params.fetch('per_page', max_per_page).to_i + @per_page = max_per_page if @per_page > max_per_page + end + + def paginate_response(results:) + results = results.page(@page).per(@per_page) + @total_items = results.total_count + results + end + + def require_read_scope + raise Pundit::NotAuthorizedError unless doorkeeper_token.scopes.include?('read') + end + end + end +end diff --git a/app/controllers/api/v2/plans_controller.rb b/app/controllers/api/v2/plans_controller.rb new file mode 100644 index 0000000000..1b79d8da66 --- /dev/null +++ b/app/controllers/api/v2/plans_controller.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +module Api + module V2 + class PlansController < BaseApiController # rubocop:todo Style/Documentation + respond_to :json + before_action :set_complete_param, only: %i[show index] + + # GET /api/v2/plans/:id + def show + @plan = plans_scope.find_by(id: params[:id]) + + plans_policy = PlansPolicy.new(@resource_owner, @plan) + raise Pundit::NotAuthorizedError unless plans_policy.show? + + @items = [@plan] + render '/api/v2/plans/index', status: :ok + end + + # GET /api/v2/plans + def index + @plans = plans_scope + @items = paginate_response(results: @plans) + render '/api/v2/plans/index', status: :ok + end + + private + + # GET /api/v2/plans?complete=true and /api/v2/plans/:id?complete=true + def set_complete_param + @complete = params[:complete].to_s.downcase == 'true' + end + + def plans_scope + scope = PlansPolicy::Scope.new(@resource_owner).resolve + @complete ? scope.includes(answers: { question: :section }) : scope + end + end + end +end diff --git a/app/controllers/api/v2/templates_controller.rb b/app/controllers/api/v2/templates_controller.rb new file mode 100644 index 0000000000..2b9a4bf4bb --- /dev/null +++ b/app/controllers/api/v2/templates_controller.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Api + module V2 + # provides a list of templates for API V2 + class TemplatesController < BaseApiController + respond_to :json + + # GET /api/v2/templates + def index + templates = Api::V2::TemplatesPolicy::Scope.new(@resource_owner).resolve + @items = paginate_response(results: templates) + render '/api/v2/templates/index', status: :ok + end + end + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1e2c29fcce..0552a00458 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -56,36 +56,31 @@ def store_location # store last url - this is needed for post-login redirect to whatever the user last # visited. # don't store ajax calls - unless ['/users/sign_in', - '/users/sign_up', - '/users/password', - '/users/invitation/accept'].any? { |ur| request.fullpath.include?(ur) } || request.xhr? - session[:previous_url] = request.fullpath - end + devise_paths = %r{/users/(sign_in|sign_up|password|invitation/accept)} + return if request.fullpath.match?(devise_paths) || request.xhr? + + session[:previous_url] = request.fullpath end - # rubocop:disable Metrics/AbcSize def after_sign_in_path_for(_resource) - referer_path = URI(request.referer).path unless request.referer.nil? - if from_external_domain? || referer_path.eql?(new_user_session_path) || - referer_path.eql?(new_user_registration_path) || - referer_path.nil? - root_path - else - request.referer - end + after_auth_path(disallowed_paths: [new_user_session_path, new_user_registration_path]) end - # rubocop:enable Metrics/AbcSize def after_sign_up_path_for(_resource) - referer_path = URI(request.referer).path unless request.referer.nil? - if from_external_domain? || - referer_path.eql?(new_user_session_path) || - referer_path.nil? - root_path - else - request.referer - end + after_auth_path(disallowed_paths: [new_user_session_path]) + end + + def after_auth_path(disallowed_paths:) + # ensure oauth2 authorization flow is not interrupted + # TODO: Unless nil, should stored_location_for(resource) always be returned? + return stored_location_for(:user) if user_is_in_oauth_flow? + + return root_path if request.referer.nil? || from_external_domain? + + referer_path = URI(request.referer).path + return root_path if disallowed_paths.include?(referer_path) + + request.referer end def after_sign_in_error_path_for(_resource) @@ -197,4 +192,8 @@ def render_respond_to_format_with_error_message(msg, url_or_path, http_status, e end end end + + def user_is_in_oauth_flow? + session[:user_return_to]&.start_with?(oauth_authorization_path) + end end diff --git a/app/controllers/concerns/plan_permitted_params.rb b/app/controllers/concerns/plan_permitted_params.rb new file mode 100644 index 0000000000..90363f9de8 --- /dev/null +++ b/app/controllers/concerns/plan_permitted_params.rb @@ -0,0 +1,158 @@ +# frozen_string_literal: true + +module PlanPermittedParams # rubocop:todo Metrics/ModuleLength, Style/Documentation + extend ActiveSupport::Concern + + def plan_permitted_params + [ + :created, + :title, + :description, + :language, + :ethical_issues_exist, + :ethical_issues_description, + :ethical_issues_report, + { dmp_ids: identifier_permitted_params }, + { contact: contributor_permitted_params }, + { contributors: contributor_permitted_params }, + { costs: cost_permitted_params }, + { project: project_permitted_params }, + { datasets: dataset_permitted_params } + ] + end + + def identifier_permitted_params + %i[ + type + identifier + ] + end + + def contributor_permitted_params + [ + :firstname, + :surname, + :mbox, + :role, + { affiliations: affiliation_permitted_params }, + { contributor_ids: identifier_permitted_params } + ] + end + + def affiliation_permitted_params + [ + :name, + :abbreviation, + { affiliation_ids: identifier_permitted_params } + ] + end + + def cost_permitted_params + %i[ + title + description + value + currency_code + ] + end + + def project_permitted_params + [ + :title, + :description, + :start_on, + :end_on, + { funding: funding_permitted_params } + ] + end + + def funding_permitted_params + [ + :name, + :funding_status, + { funder_ids: identifier_permitted_params }, + { grant_ids: identifier_permitted_params } + ] + end + + def dataset_permitted_params + [ + :title, + :doi_url, + :description, + :type, + :issued, + :language, + :personal_data, + :sensitive_data, + :keywords, + :data_quality_assurance, + :preservation_statement, + { dataset_ids: identifier_permitted_params }, + { metadata: metadatum_permitted_params }, + { security_and_privacy_statements: security_and_privacy_statement_permitted_params }, + { technical_resources: technical_resource_permitted_params }, + { distributions: distribution_permitted_params } + ] + end + + def metadatum_permitted_params + [ + :description, + :language, + { identifier: identifier_permitted_params } + ] + end + + def security_and_privacy_statement_permitted_params + %i[ + title + description + ] + end + + def technical_resource_permitted_params + [ + :description, + { identifier: identifier_permitted_params } + ] + end + + def distribution_permitted_params + [ + :title, + :description, + :format, + :byte_size, + :access_url, + :download_url, + :data_access, + :available_until, + { licenses: license_permitted_params }, + { host: host_permitted_params } + ] + end + + def license_permitted_params + %i[ + license_ref + start_date + ] + end + + def host_permitted_params + [ + :title, + :description, + :supports_versioning, + :backup_type, + :backup_frequency, + :storage_type, + :availability, + :geo_location, + :certified_with, + :pid_system, + { host_ids: identifier_permitted_params } + ] + end +end diff --git a/app/controllers/org_admin/phases_controller.rb b/app/controllers/org_admin/phases_controller.rb index f27a3e7380..f7c30a431d 100644 --- a/app/controllers/org_admin/phases_controller.rb +++ b/app/controllers/org_admin/phases_controller.rb @@ -58,7 +58,7 @@ def edit phase: phase, prefix_section: phase.prefix_section, sections: phase.sections.order(:number) - .select(:id, :title, :modifiable, :phase_id), + .select(:id, :title, :modifiable, :phase_id), suffix_sections: phase.suffix_sections.order(:number), current_section: Section.find_by(id: params[:section], phase_id: phase.id) }) diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb index 5cf5a692b8..97e007bf0d 100644 --- a/app/controllers/paginable/plans_controller.rb +++ b/app/controllers/paginable/plans_controller.rb @@ -46,7 +46,7 @@ def org_admin @super_admin = current_user.can_super_admin? @clicked_through = params[:click_through].present? plans = @super_admin ? Plan.all : current_user.org.org_admin_plans - plans = plans.joins(:template, roles: [user: :org]).where(Role.creator_condition) + plans = plans.joins(:template, roles: [{ user: :org }]).where(Role.creator_condition) paginable_renderise( partial: 'org_admin', diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index c66bbfdeb4..a1194e3706 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -200,9 +200,9 @@ def show end # Sort the rest by org name for the accordion - @important_ggs = @important_ggs.sort_by { |org, _gg| (org.nil? ? '' : org.name) } + @important_ggs = @important_ggs.sort_by { |org, _gg| org.nil? ? '' : org.name } @all_ggs_grouped_by_org = @all_ggs_grouped_by_org.sort_by do |org, _gg| - (org.nil? ? '' : org.name) + org.nil? ? '' : org.name end @selected_guidance_groups = @selected_guidance_groups.ids @@ -526,7 +526,7 @@ def render_phases_edit(plan, phase, guidance_groups) readonly = !plan.editable_by?(current_user.id) # Since the answers have been pre-fetched through plan (see Plan.load_for_phase) # we create a hash whose keys are question id and value is the answer associated - answers = plan.answers.each_with_object({}) { |a, m| m[a.question_id] = a } + answers = plan.answers.to_h { |a| [a.question_id, a] } render('/phases/edit', locals: { base_template_org: phase.template.base_org, plan: plan, diff --git a/app/controllers/super_admin/orgs_controller.rb b/app/controllers/super_admin/orgs_controller.rb index 18fc1fa4b9..3d590ecb90 100644 --- a/app/controllers/super_admin/orgs_controller.rb +++ b/app/controllers/super_admin/orgs_controller.rb @@ -105,8 +105,8 @@ def merge_analyze @org = Org.includes(:templates, :tracker, :annotations, :departments, :token_permission_types, :funded_plans, identifiers: [:identifier_scheme], - guidance_groups: [guidances: [:themes]], - users: [identifiers: [:identifier_scheme]]) + guidance_groups: [{ guidances: [:themes] }], + users: [{ identifiers: [:identifier_scheme] }]) .find(params[:id]) authorize @org @@ -116,8 +116,8 @@ def merge_analyze @target_org = Org.includes(:templates, :tracker, :annotations, :departments, :token_permission_types, :funded_plans, identifiers: [:identifier_scheme], - guidance_groups: [guidances: [:themes]], - users: [identifiers: [:identifier_scheme]]) + guidance_groups: [{ guidances: [:themes] }], + users: [{ identifiers: [:identifier_scheme] }]) .find(lookup.id) end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 20b9e442c0..b9c9469510 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -191,12 +191,14 @@ def notification_params def preference_params params.require(:user).permit( prefs: [ - users: %i[new_comment - added_as_coowner - admin_privileges - feedback_requested - feedback_provided], - owners_and_coowners: %i[visibility_changed] + { + users: %i[new_comment + added_as_coowner + admin_privileges + feedback_requested + feedback_provided], + owners_and_coowners: %i[visibility_changed] + } ] ) end diff --git a/app/models/guidance_group.rb b/app/models/guidance_group.rb index c108cea48e..95ae0fd147 100644 --- a/app/models/guidance_group.rb +++ b/app/models/guidance_group.rb @@ -107,7 +107,7 @@ def self.can_view?(user, guidance_group) # Returns Array def self.all_viewable(user) # first find all groups owned by the Default Orgs - default_org_groups = Org.includes(guidance_groups: [guidances: :themes]) + default_org_groups = Org.includes(guidance_groups: [{ guidances: :themes }]) .default_orgs.collect(&:guidance_groups) # find all groups owned by a Funder organisation diff --git a/app/models/plan.rb b/app/models/plan.rb index 22630c6f20..6b32c7f630 100644 --- a/app/models/plan.rb +++ b/app/models/plan.rb @@ -185,12 +185,12 @@ class Plan < ApplicationRecord scope :search, lambda { |term| if date_range?(term: term) - joins(:template, roles: [user: :org]) + joins(:template, roles: [{ user: :org }]) .where(roles: { active: true }) .by_date_range(:created_at, term) else search_pattern = "%#{term}%" - joins(:template, roles: [user: :org]) + joins(:template, roles: [{ user: :org }]) .left_outer_joins(:identifiers, :contributors) .where(roles: { active: true }) .where("lower(plans.title) LIKE lower(:search_pattern) @@ -213,6 +213,41 @@ class Plan < ApplicationRecord includes(:phases, :sections, :questions, template: [:org]).find(id) } + # Eager loads all associations needed for API v2 serialization, + # and restricts to plans where the user_id has an active role. + scope :for_api_v2, lambda { |user_id| # rubocop:disable Metrics/BlockLength + joins(:roles) + .includes( + :research_outputs, + :template, + { identifiers: :identifier_scheme }, + funder: { identifiers: :identifier_scheme }, + contributors: [ + { identifiers: :identifier_scheme }, + { org: { identifiers: :identifier_scheme } } + ], + roles: [ + { + user: [ + :language, + { identifiers: :identifier_scheme }, + { org: { identifiers: :identifier_scheme } } + ] + } + ], + # plan.org is only executed when `plan.funder.present? || plan.grant_id.present? == true` + # - (see `app/views/api/v2/plans/_project.json.jbuilder`) + # Thus, the following line avoids N+1 queries in some cases, + # but performs unnecessary eager loading in others + org: [ + :region, + { identifiers: :identifier_scheme } + ] + ) + .where(roles: { user_id: user_id, active: true }) + .distinct + } + ## # Settings for the template has_settings :export, class_name: 'Settings::Template' do |s| diff --git a/app/models/template.rb b/app/models/template.rb index d99697dcef..e8fa9d92eb 100644 --- a/app/models/template.rb +++ b/app/models/template.rb @@ -215,6 +215,16 @@ class Template < ApplicationRecord term: "%#{term}%") } + scope :for_api_v2, lambda { |org_id| + org_templates = organisationally_visible.where(org_id: org_id) + public_templates = publicly_visible.where(customization_of: nil) + includes(org: { identifiers: :identifier_scheme }) + .joins(:org) + .published + .merge(org_templates.or(public_templates)) + .order(:title) + } + # defines the export setting for a template object has_settings :export, class_name: 'Settings::Template' do |s| s.key :export, defaults: Settings::Template::DEFAULT_SETTINGS diff --git a/app/models/user.rb b/app/models/user.rb index c8e0b42131..ce54b975c3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -101,6 +101,12 @@ class User < ApplicationRecord has_and_belongs_to_many :notifications, dependent: :destroy, join_table: 'notification_acknowledgements' + has_many :access_grants, class_name: 'Doorkeeper::AccessGrant', foreign_key: :resource_owner_id, + dependent: :delete_all + + has_many :access_tokens, class_name: 'Doorkeeper::AccessToken', foreign_key: :resource_owner_id, + dependent: :delete_all + # =============== # = Validations = # =============== diff --git a/app/policies/api/v2/plans_policy.rb b/app/policies/api/v2/plans_policy.rb new file mode 100644 index 0000000000..16fc07edd4 --- /dev/null +++ b/app/policies/api/v2/plans_policy.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +module Api + module V2 + # Security rules for API V2 Plan endpoints + class PlansPolicy < ApplicationPolicy + # overriding the initializer due to resource owner / user + # not needing to be logged in for client app to make requests + def initialize(resource_owner, plan = nil) # rubocop:todo Lint/MissingSuper + @resource_owner = resource_owner + @plan = plan + end + + def show? + # The show action uses the resolve method, so only a presence check + # is needed here (see the resolve method comment for more). + @plan.present? + end + + class Scope < Scope # rubocop:todo Style/Documentation + def initialize(resource_owner) # rubocop:todo Lint/MissingSuper + @resource_owner = resource_owner + end + + # Eager loads all associations needed for API v2 serialization, + # and restricts to plans where the user_id has an active role. + # - (i.e. .where(roles: { user_id: @resource_owner.id, active: true })) + def resolve + Plan.for_api_v2(@resource_owner.id) + end + end + end + end +end diff --git a/app/policies/api/v2/templates_policy.rb b/app/policies/api/v2/templates_policy.rb new file mode 100644 index 0000000000..c12a14737b --- /dev/null +++ b/app/policies/api/v2/templates_policy.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module Api + module V2 + class TemplatesPolicy < ApplicationPolicy + class Scope < Scope # rubocop:todo Style/Documentation + def initialize(resource_owner) # rubocop:todo Lint/MissingSuper + @resource_owner = resource_owner + end + + def resolve + # get the templates + Template.for_api_v2(@resource_owner.org&.id) + end + end + end + end +end diff --git a/app/presenters/api/v2/api_presenter.rb b/app/presenters/api/v2/api_presenter.rb new file mode 100644 index 0000000000..1ad7290ab6 --- /dev/null +++ b/app/presenters/api/v2/api_presenter.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module Api + module V2 + # Generic helper methods for API V2 + class ApiPresenter + class << self + def boolean_to_yes_no_unknown(value:) + return 'unknown' unless value.present? + + value ? 'yes' : 'no' + end + end + end + end +end diff --git a/app/presenters/api/v2/contributor_presenter.rb b/app/presenters/api/v2/contributor_presenter.rb new file mode 100644 index 0000000000..77232c2838 --- /dev/null +++ b/app/presenters/api/v2/contributor_presenter.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper class for the API V2 contributors views + class ContributorPresenter + class << self + # Convert the specified role into a CRediT Taxonomy URL + def role_as_uri(role:) + return nil unless role.present? + return 'other' if role.to_s.casecmp('other').zero? + + "#{Contributor::ONTOLOGY_BASE_URL}/#{role.to_s.downcase.tr('_', '-')}" + end + + def contributor_id(identifiers:) + identifiers.find { |id| id.identifier_scheme.name == 'orcid' } + end + end + end + end +end diff --git a/app/presenters/api/v2/funding_presenter.rb b/app/presenters/api/v2/funding_presenter.rb new file mode 100644 index 0000000000..c878daadb6 --- /dev/null +++ b/app/presenters/api/v2/funding_presenter.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper class for the API V2 funding section + class FundingPresenter + class << self + # If the plan has a grant number then it has been awarded/granted + # otherwise it is 'planned' + def status(plan:) + return 'planned' unless plan.present? + + case plan.funding_status + when 'funded' + 'granted' + when 'denied' + 'rejected' + else + 'planned' + end + end + end + end + end +end diff --git a/app/presenters/api/v2/language_presenter.rb b/app/presenters/api/v2/language_presenter.rb new file mode 100644 index 0000000000..2be21c7e38 --- /dev/null +++ b/app/presenters/api/v2/language_presenter.rb @@ -0,0 +1,85 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper class for the API V2 language values + class LanguagePresenter + class << self + LANGUAGE_MAP = { + aa: 'aar', ab: 'abk', af: 'afr', ak: 'aka', am: 'amh', ar: 'ara', an: 'arg', + as: 'asm', av: 'ava', ae: 'ave', ay: 'aym', az: 'aze', + + ba: 'bak', bm: 'bam', be: 'bel', bn: 'ben', bh: 'bih', bi: 'bis', bo: 'tib', + bs: 'bos', br: 'bre', bg: 'bul', + + ca: 'cat', cs: 'cze', ch: 'cha', ce: 'che', cu: 'chu', cv: 'chv', co: 'cos', + cr: 'cre', cy: 'wel', + + da: 'dan', de: 'deu', dv: 'div', dz: 'dzo', + + el: 'gre', en: 'eng', eo: 'epo', es: 'spa', et: 'est', eu: 'baq', ee: 'ewe', + + fo: 'fao', fa: 'per', fj: 'fij', fi: 'fin', fr: 'fre', fy: 'fry', ff: 'ful', + + gd: 'gla', ga: 'gle', gl: 'glg', gv: 'glv', gn: 'grn', gu: 'guj', + + ht: 'hat', ha: 'hau', he: 'heb', hz: 'her', hi: 'hin', ho: 'hmo', hr: 'hrv', + hu: 'hun', hy: 'arm', + + ig: 'ibo', io: 'ido', ii: 'iii', iu: 'iku', ie: 'ile', ia: 'ina', id: 'ind', + ik: 'ipk', is: 'ice', it: 'ita', + + jv: 'jav', ja: 'jpn', + + kl: 'kal', kn: 'kan', ks: 'kas', kr: 'kau', kk: 'kaz', km: 'khm', ki: 'kik', + ky: 'kir', kv: 'kom', kg: 'kon', ko: 'kor', kj: 'kua', ku: 'kur', ka: 'geo', + kw: 'cor', + + lo: 'lao', la: 'lat', lv: 'lav', li: 'lim', ln: 'lin', lt: 'lit', lb: 'ltz', + lu: 'lub', lg: 'lug', + + mk: 'mac', mh: 'mah', ml: 'mal', mi: 'mao', mr: 'mar', ms: 'may', mg: 'mlg', + mt: 'mlt', mn: 'mon', my: 'bur', + + na: 'nau', nv: 'nav', nr: 'nbl', nd: 'nde', ng: 'ndo', ne: 'nep', nl: 'dut', + nn: 'nno', nb: 'nob', no: 'nor', ny: 'nya', + + oc: 'oci', oj: 'oji', or: 'ori', om: 'orm', os: 'oss', + + pa: 'pan', pi: 'pli', pl: 'pol', pt: 'por', ps: 'pus', + + qu: 'que', + + rm: 'roh', ro: 'rum', rn: 'run', ru: 'rus', rw: 'kin', + + sg: 'sag', sa: 'san', si: 'sin', sk: 'slo', sl: 'slv', se: 'sme', sm: 'smo', + sn: 'sna', sd: 'snd', so: 'som', st: 'sot', sq: 'alb', sc: 'srd', sr: 'srp', + ss: 'ssw', su: 'sun', sw: 'swa', sv: 'swe', + + ty: 'tah', ta: 'tam', tt: 'tat', te: 'tel', tg: 'tgk', tl: 'tgl', th: 'tha', + ti: 'tir', to: 'ton', tn: 'tsn', ts: 'tso', tk: 'tuk', tr: 'tur', tw: 'twi', + + ug: 'uig', uk: 'ukr', ur: 'urd', uz: 'uzb', + + ve: 'ven', vi: 'vie', vo: 'vol', + + wa: 'wln', wo: 'wol', + + xh: 'xho', + + yi: 'yid', yo: 'yor', + + za: 'zha', zh: 'chi', zu: 'zul' + }.freeze + + # Convert the incoming 2 (e.g. en - ISO 639-1) or 2+region (e.g. en-UK) + # into the 3 character code (e.g. eng - ISO 639-2) + def three_char_code(lang:) + lang ||= LocaleService.default_locale + two_char_code = lang.to_s.split('-').first + LANGUAGE_MAP[two_char_code.to_sym] + end + end + end + end +end diff --git a/app/presenters/api/v2/org_presenter.rb b/app/presenters/api/v2/org_presenter.rb new file mode 100644 index 0000000000..5302acb7a7 --- /dev/null +++ b/app/presenters/api/v2/org_presenter.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper class for the API V2 affiliation sections + class OrgPresenter + class << self + def affiliation_id(identifiers:) + ident = identifiers.find { |id| id.identifier_scheme&.name == 'ror' } + return ident if ident.present? + + identifiers.find { |id| id.identifier_scheme&.name == 'fundref' } + end + end + end + end +end diff --git a/app/presenters/api/v2/pagination_presenter.rb b/app/presenters/api/v2/pagination_presenter.rb new file mode 100644 index 0000000000..1b8fbc1109 --- /dev/null +++ b/app/presenters/api/v2/pagination_presenter.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper class for genewric API V2 pagination + class PaginationPresenter + def initialize(current_url:, per_page:, total_items:, current_page: 1) + @url = current_url + @per_page = per_page + @total_items = total_items + @page = current_page + end + + def url_without_pagination + return nil unless @url.present? && @url.is_a?(String) + + url = @url.gsub(/per_page=\d+/, '') + .gsub(/page=\d+/, '') + .gsub(/(&)+$/, '').gsub(/\?$/, '') + + (url.include?('?') ? "#{url}&" : "#{url}?") + end + + def prev_page? + total_pages > 1 && @page != 1 + end + + def next_page? + total_pages > 1 && @page < total_pages + end + + def prev_page_link + "#{url_without_pagination}page=#{@page - 1}&per_page=#{@per_page}" + end + + def next_page_link + "#{url_without_pagination}page=#{@page + 1}&per_page=#{@per_page}" + end + + private + + def total_pages + return 1 unless @total_items.present? && @per_page.present? && + @total_items.positive? && @per_page.positive? + + (@total_items.to_f / @per_page).ceil + end + end + end +end diff --git a/app/presenters/api/v2/plan_presenter.rb b/app/presenters/api/v2/plan_presenter.rb new file mode 100644 index 0000000000..8cb7eca6ef --- /dev/null +++ b/app/presenters/api/v2/plan_presenter.rb @@ -0,0 +1,76 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper class for the API V2 project / DMP + class PlanPresenter + attr_reader :data_contact, :contributors, :costs, :complete_plan_data + + def initialize(plan:, complete: false) + @contributors = [] + return unless plan.present? + + @plan = plan + + # Use owner or first data_curation role as the data_contact + @data_contact = @plan.owner || @plan.contributors.find(&:data_curation?) + @contributors = @plan.contributors.to_a + + @costs = plan_costs(plan: @plan) + + @complete_plan_data = fetch_all_q_and_a if complete + end + + # Extract the ARK or DOI for the DMP OR use its URL if none exists + def identifier + doi = @plan.identifiers.select do |id| + ::Plan::DMP_ID_TYPES.include?(id.identifier_format) + end + return doi.first if doi.first.present? + + # if no DOI then use the URL for the API's 'show' method + Identifier.new(value: Rails.application.routes.url_helpers.api_v2_plan_url(@plan)) + end + + private + + # Retrieve the answers that have the Budget theme + def plan_costs(plan:) + theme = Theme.where(title: 'Cost').first + return [] unless theme.present? + + # TODO: define a new 'Currency' question type that includes a float field + # any currency type selector (e.g GBP or USD) + answers = plan.answers + .joins(question: :themes) + .where(themes: { id: theme.id }) + .includes(:question) + + answers.map do |answer| + # TODO: Investigate whether question level guidance should be the description + { title: answer.question.text, description: nil, + currency_code: 'usd', value: answer.text } + end + end + + # Fetch all questions and answers from a plan, regardless of theme + def fetch_all_q_and_a + answers = @plan.answers + return [] unless answers.present? + + answers.filter_map do |answer| + q = answer.question + next unless q.present? + + { + id: q.id, + title: "Question #{q.number || q.id}", + section: q.section&.title, + question: q.text.to_s, + answer: answer.text.to_s + } + end + end + end + end +end diff --git a/app/presenters/api/v2/research_output_presenter.rb b/app/presenters/api/v2/research_output_presenter.rb new file mode 100644 index 0000000000..33308bd9ae --- /dev/null +++ b/app/presenters/api/v2/research_output_presenter.rb @@ -0,0 +1,96 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper methods for research outputs + class ResearchOutputPresenter + attr_reader :dataset_id, :preservation_statement, :security_and_privacy, :license_start_date, + :data_quality_assurance, :distributions, :metadata, :technical_resources + + def initialize(output:) + @research_output = output + return unless output.is_a?(ResearchOutput) + + @plan = output.plan + @dataset_id = identifier + + load_narrative_content + + @license_start_date = determine_license_start_date(output: output) + end + + private + + def identifier + Identifier.new(identifiable: @research_output, value: @research_output.id) + end + + def determine_license_start_date(output:) + return nil unless output.present? + return output.release_date.to_formatted_s(:iso8601) if output.release_date.present? + + output.created_at.to_formatted_s(:iso8601) + end + + def load_narrative_content + @preservation_statement = '' + @security_and_privacy = [] + @data_quality_assurance = '' + + # Disabling rubocop here since a guard clause would make the line too long + # rubocop:disable Style/GuardClause + if Rails.configuration.x.madmp.extract_preservation_statements_from_themed_questions + @preservation_statement = fetch_q_and_a_as_single_statement(themes: %w[Preservation]) + end + if Rails.configuration.x.madmp.extract_security_privacy_statements_from_themed_questions + @security_and_privacy = fetch_q_and_a(themes: ['Ethics & privacy', 'Storage & security']) + end + if Rails.configuration.x.madmp.extract_data_quality_statements_from_themed_questions + @data_quality_assurance = fetch_q_and_a_as_single_statement(themes: ['Data Collection']) + end + # rubocop:enable Style/GuardClause + end + + def fetch_q_and_a_as_single_statement(themes:) + fetch_q_and_a(themes: themes).collect { |item| item[:description] }.join('
') + end + + def fetch_q_and_a(themes:) + return [] unless themes.is_a?(Array) && themes.any? + + answers = answers_for_themes(themes) + + descs_by_theme = build_descriptions_by_theme_hash(answers, themes) + + descs_by_theme.map do |theme, descs| + { title: theme, description: descs } + end + end + + def answers_for_themes(themes) + @plan.answers + .joins(question: :themes) + .where(themes: { title: themes }) + .includes(question: :themes) + .distinct + end + + def build_descriptions_by_theme_hash(answers, themes) + descs_by_theme = Hash.new { |h, k| h[k] = [] } + + answers.each do |answer| + answer.question.themes.each do |theme| + next unless themes.include?(theme.title) + + descs_by_theme[theme.title] << format_q_and_a(answer.question, answer) + end + end + descs_by_theme + end + + def format_q_and_a(question, answer) + "Question: #{question.text}
Answer: #{answer.text}" + end + end + end +end diff --git a/app/presenters/api/v2/template_presenter.rb b/app/presenters/api/v2/template_presenter.rb new file mode 100644 index 0000000000..2d32a45d37 --- /dev/null +++ b/app/presenters/api/v2/template_presenter.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper class for the API V2 template info + class TemplatePresenter + def initialize(template:) + @template = template + end + + # If the plan has a grant number then it has been awarded/granted + # otherwise it is 'planned' + def title + return @template.title unless @template.customization_of.present? + + "#{@template.title} - with additional questions for #{@template.org.name}" + end + end + end +end diff --git a/app/presenters/guidance_presenter.rb b/app/presenters/guidance_presenter.rb index b268d34935..4018ad940c 100644 --- a/app/presenters/guidance_presenter.rb +++ b/app/presenters/guidance_presenter.rb @@ -38,7 +38,7 @@ def any?(org: nil, question: nil) # question - The question to which guidance pretains # # Returns an array of tab hashes. These - # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize + # rubocop:disable Metrics/AbcSize def tablist(question) # start with orgs # filter into hash with annotation_presence, main_group presence, and @@ -46,8 +46,7 @@ def tablist(question) orgs.each do |org| annotations = guidance_annotations(org: org, question: question) groups = guidance_groups_by_theme(org: org, question: question) - main_groups = groups.select { |group| group.optional_subset == false } - subsets = groups.reject { |group| group.optional_subset == false } + main_groups, subsets = groups.partition { |group| group.optional_subset == false } if annotations.present? || main_groups.present? # annotations and main group # Tab with org.abbreviation display_tabs << { name: org.abbreviation, groups: main_groups, @@ -61,7 +60,7 @@ def tablist(question) end display_tabs end - # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize + # rubocop:enable Metrics/AbcSize private @@ -201,8 +200,8 @@ def hashify_guidance_groups org_guidance_groups = hashified_guidances.each_key.select do |gg| gg.org_id == org.id end - acc[org] = org_guidance_groups.each_with_object({}) do |gg, acc_inner| - acc_inner[gg] = hashified_guidances[gg] + acc[org] = org_guidance_groups.to_h do |gg| + [gg, hashified_guidances[gg]] end end end @@ -215,8 +214,8 @@ def hashify_guidances themes = Theme.includes(:guidances) .joins(:guidances) .merge(Guidance.where(guidance_group_id: gg.id, published: true)) - acc[gg] = themes.each_with_object({}) do |theme, acc_inner| - acc_inner[theme] = theme.guidances + acc[gg] = themes.to_h do |theme| + [theme, theme.guidances] end end end diff --git a/app/services/api/v2/conversion_service.rb b/app/services/api/v2/conversion_service.rb new file mode 100644 index 0000000000..4a9a932878 --- /dev/null +++ b/app/services/api/v2/conversion_service.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +module Api + module V2 + # Helper service that translates to/from the RDA common standard + class ConversionService + class << self + # Converts a boolean field to [yes, no, unknown] + def boolean_to_yes_no_unknown(value) + return 'yes' if [true, 1].include?(value) + + return 'no' if [false, 0].include?(value) + + 'unknown' + end + + # Converts a [yes, no, unknown] field to boolean (or nil) + def yes_no_unknown_to_boolean(value) + return true if value&.downcase == 'yes' + + return nil if value.blank? || value&.downcase == 'unknown' + + false + end + + # Converts the context and value into an Identifier with a psuedo + # IdentifierScheme for display in JSON partials. Which will result in: + # { type: 'context', identifier: 'value' } + def to_identifier(context:, value:) + return nil unless value.present? && context.present? + + scheme = IdentifierScheme.new(name: context) + Identifier.new(value: value, identifier_scheme: scheme) + end + end + end + end +end diff --git a/app/views/api/v2/_standard_response.json.jbuilder b/app/views/api/v2/_standard_response.json.jbuilder new file mode 100644 index 0000000000..372c42cb31 --- /dev/null +++ b/app/views/api/v2/_standard_response.json.jbuilder @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +# locals: response, request, total_items + +total_items ||= 0 + +paginator = Api::V2::PaginationPresenter.new(current_url: request.path, + per_page: @per_page, + total_items: total_items, + current_page: @page) + +json.prettify! +json.ignore_nil! + +json.application @application +json.source "#{request.method} #{request.path}" +json.time Time.now.to_formatted_s(:iso8601) +json.caller @caller +json.code response.status +json.message Rack::Utils::HTTP_STATUS_CODES[response.status] + +if response.status == 200 + + # Pagination Links + if total_items.positive? + json.page @page + json.per_page @per_page + json.total_items total_items + + # Prepare the base URL by removing the old pagination params + json.prev paginator.prev_page_link if paginator.prev_page? + json.next paginator.next_page_link if paginator.next_page? + else + json.total_items 0 + end + +end diff --git a/app/views/api/v2/contributors/_show.json.jbuilder b/app/views/api/v2/contributors/_show.json.jbuilder new file mode 100644 index 0000000000..267ff7e3d2 --- /dev/null +++ b/app/views/api/v2/contributors/_show.json.jbuilder @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +# locals: contributor, is_contact + +is_contact ||= false + +json.name contributor.is_a?(User) ? contributor.name(false) : contributor.name +json.mbox contributor.email + +if !is_contact && contributor.selected_roles.any? + roles = contributor.selected_roles.map do |role| + Api::V2::ContributorPresenter.role_as_uri(role: role) + end + json.role roles if roles.any? +end + +if contributor.org.present? + json.affiliation do + json.partial! 'api/v2/orgs/show', org: contributor.org + end +end + +orcid = contributor.identifier_for_scheme(scheme: 'orcid') +if orcid.present? + id = Api::V2::ContributorPresenter.contributor_id( + identifiers: contributor.identifiers + ) + if is_contact + json.contact_id do + json.partial! 'api/v2/identifiers/show', identifier: id + end + else + json.contributor_id do + json.partial! 'api/v2/identifiers/show', identifier: id + end + end +end diff --git a/app/views/api/v2/datasets/_show.json.jbuilder b/app/views/api/v2/datasets/_show.json.jbuilder new file mode 100644 index 0000000000..6e856019cd --- /dev/null +++ b/app/views/api/v2/datasets/_show.json.jbuilder @@ -0,0 +1,83 @@ +# frozen_string_literal: true + +# locals: output + +if output.is_a?(ResearchOutput) + presenter = Api::V2::ResearchOutputPresenter.new(output: output) + + json.type output.output_type + json.title output.title + json.description output.description + json.personal_data Api::V2::ApiPresenter.boolean_to_yes_no_unknown(value: output.personal_data) + json.sensitive_data Api::V2::ApiPresenter.boolean_to_yes_no_unknown(value: output.sensitive_data) + json.issued output.release_date&.to_formatted_s(:iso8601) + + json.preservation_statement presenter.preservation_statement + json.security_and_privacy presenter.security_and_privacy + json.data_quality_assurance presenter.data_quality_assurance + + json.dataset_id do + json.partial! "api/v2/identifiers/show", identifier: presenter.dataset_id + end + + json.distribution output.repositories do |repository| + json.title "Anticipated distribution for #{output.title}" + json.byte_size output.byte_size + json.data_access output.access + + json.host do + json.title repository.name + json.description repository.description + json.url repository.homepage + + # DMPTool extensions to the RDA common metadata standard + json.dmproadmap_host_id do + json.type "url" + json.identifier repository.uri + end + end + + if output.license.present? + json.license [output.license] do |license| + json.license_ref license.uri + json.start_date presenter.license_start_date + end + end + end + + json.metadata output.metadata_standards do |metadata_standard| + website = metadata_standard.locations.find { |loc| loc["type"] == "website" } + website = { url: "" } unless website.present? + + descr_array = [metadata_standard.title, metadata_standard.description, website["url"]] + json.description descr_array.join(" - ") + + json.metadata_standard_id do + json.type "url" + json.identifier metadata_standard.uri + end + end + + json.technical_resource [] + + if output.plan.research_domain_id.present? + research_domain = ResearchDomain.find_by(id: output.plan.research_domain_id) + if research_domain.present? + combined = "#{research_domain.identifier} - #{research_domain.label}" + json.keyword [research_domain.label, combined] + end + end + +else + json.type "dataset" + json.title "Generic dataset" + json.description "No individual datasets have been defined for this DMP." + + if output.research_domain_id.present? + research_domain = ResearchDomain.find_by(id: output.research_domain_id) + if research_domain.present? + combined = "#{research_domain.identifier} - #{research_domain.label}" + json.keyword [research_domain.label, combined] + end + end +end diff --git a/app/views/api/v2/error.json.jbuilder b/app/views/api/v2/error.json.jbuilder new file mode 100644 index 0000000000..2576ad3e9c --- /dev/null +++ b/app/views/api/v2/error.json.jbuilder @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +json.partial! 'api/v2/standard_response' + +# json.items [] +json.errors @payload[:errors] +json.details @payload[:details] diff --git a/app/views/api/v2/heartbeat.json.jbuilder b/app/views/api/v2/heartbeat.json.jbuilder new file mode 100644 index 0000000000..70b165b95d --- /dev/null +++ b/app/views/api/v2/heartbeat.json.jbuilder @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +json.partial! 'api/v2/standard_response' + +json.items [] diff --git a/app/views/api/v2/identifiers/_show.json.jbuilder b/app/views/api/v2/identifiers/_show.json.jbuilder new file mode 100644 index 0000000000..c219222aee --- /dev/null +++ b/app/views/api/v2/identifiers/_show.json.jbuilder @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +# locals: identifier + +json.type identifier&.identifier_format +json.identifier identifier&.value diff --git a/app/views/api/v2/me.json.jbuilder b/app/views/api/v2/me.json.jbuilder new file mode 100644 index 0000000000..18a1e7c114 --- /dev/null +++ b/app/views/api/v2/me.json.jbuilder @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +json.partial! 'api/v2/standard_response' + +if current_user.present? + json.items [current_user] do |user| + json.name [user.surname, user.firstname].join(', ') + json.mbox user.email + json.token user.ui_token + + if user.org.present? && ['No funder', 'Non Partner Institution'].exclude?(user.org.name) + json.affiliation do + json.partial! 'api/v2/orgs/show', org: user.org + end + end + + orcid = user.identifier_for_scheme(scheme: 'orcid') + if orcid.present? + json.user_id do + json.partial! 'api/v2/identifiers/show', identifier: orcid + end + end + end + +else + json.items [] +end diff --git a/app/views/api/v2/orgs/_show.json.jbuilder b/app/views/api/v2/orgs/_show.json.jbuilder new file mode 100644 index 0000000000..934e429a17 --- /dev/null +++ b/app/views/api/v2/orgs/_show.json.jbuilder @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +# locals: org + +json.name org.name +json.abbreviation org.abbreviation +json.region org.region&.abbreviation + +if org.identifiers.any? + json.affiliation_id do + id = Api::V2::OrgPresenter.affiliation_id(identifiers: org.identifiers) + json.partial! 'api/v2/identifiers/show', identifier: id + end +end diff --git a/app/views/api/v2/plans/_cost.json.jbuilder b/app/views/api/v2/plans/_cost.json.jbuilder new file mode 100644 index 0000000000..ad36e3540e --- /dev/null +++ b/app/views/api/v2/plans/_cost.json.jbuilder @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +# locals: cost + +json.title cost[:title] +json.description cost[:description] +json.currency_code cost[:currency_code] +json.value cost[:value] diff --git a/app/views/api/v2/plans/_funding.json.jbuilder b/app/views/api/v2/plans/_funding.json.jbuilder new file mode 100644 index 0000000000..35786ac2dc --- /dev/null +++ b/app/views/api/v2/plans/_funding.json.jbuilder @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +# locals: plan + +json.name plan.funder&.name + +if plan.funder.present? + id = Api::V2::OrgPresenter.affiliation_id(identifiers: plan.funder.identifiers) + + if id.present? + json.funder_id do + json.partial! 'api/v2/identifiers/show', identifier: id + end + end +end + +if plan.grant_id.present? && plan.grant.present? + json.grant_id do + json.partial! 'api/v2/identifiers/show', identifier: plan.grant + end +end + +json.funding_status Api::V2::FundingPresenter.status(plan: plan) + +# DMPTool extensions to the RDA common metadata standard +# ------------------------------------------------------ + +# We collect a user entered ID on the form, so this is a way to convey it to other systems +# The ID would typically be something relevant to the funder or research organization +if plan.identifier.present? + json.dmproadmap_funding_opportunity_id do + json.partial! 'api/v2/identifiers/show', identifier: Identifier.new(identifiable: plan, + value: plan.identifier) + end +end + +# Since the Plan owner (aka contact) and contributor orgs could be different than the +# one associated with the Plan, we add it here. +json.dmproadmap_funded_affiliations [plan.org] do |funded_org| + json.partial! 'api/v2/orgs/show', org: funded_org +end diff --git a/app/views/api/v2/plans/_project.json.jbuilder b/app/views/api/v2/plans/_project.json.jbuilder new file mode 100644 index 0000000000..9bf3f97fea --- /dev/null +++ b/app/views/api/v2/plans/_project.json.jbuilder @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +# locals: plan + +json.title plan.title +json.description plan.description + +start_date = plan.start_date || Time.now +json.start start_date.to_formatted_s(:iso8601) + +end_date = plan.end_date || (Time.now + 2.years) +json.end end_date&.to_formatted_s(:iso8601) + +if plan.funder.present? || plan.grant_id.present? + json.funding [plan] do + json.partial! 'api/v2/plans/funding', plan: plan + end +end diff --git a/app/views/api/v2/plans/_show.json.jbuilder b/app/views/api/v2/plans/_show.json.jbuilder new file mode 100644 index 0000000000..3e78991447 --- /dev/null +++ b/app/views/api/v2/plans/_show.json.jbuilder @@ -0,0 +1,87 @@ +# frozen_string_literal: true + +# locals: plan + +json.schema 'https://github.com/RDA-DMP-Common/RDA-DMP-Common-Standard/tree/master/examples/JSON/JSON-schema/1.0' + +presenter = Api::V2::PlanPresenter.new(plan: plan, complete: @complete) + +# Note the symbol of the dmproadmap json object +# nested in extensions which is the container for the json template object, etc. + +# A JSON representation of a Data Management Plan in the +# RDA Common Standard format +json.title plan.title +json.description plan.description +json.language Api::V2::LanguagePresenter.three_char_code( + lang: plan.owner&.language&.abbreviation +) +json.created plan.created_at.to_formatted_s(:iso8601) +json.modified plan.updated_at.to_formatted_s(:iso8601) + +json.ethical_issues_exist Api::V2::ConversionService.boolean_to_yes_no_unknown(plan.ethical_issues) +json.ethical_issues_description plan.ethical_issues_description +json.ethical_issues_report plan.ethical_issues_report + +id = presenter.identifier +if id.present? + json.dmp_id do + json.partial! 'api/v2/identifiers/show', identifier: id + end +end + +if presenter.data_contact.present? + json.contact do + json.partial! 'api/v2/contributors/show', contributor: presenter.data_contact, + is_contact: true + end +end + +unless @minimal + if presenter.contributors.any? + json.contributor presenter.contributors do |contributor| + json.partial! 'api/v2/contributors/show', contributor: contributor, + is_contact: false + end + end + + if presenter.costs.any? + json.cost presenter.costs do |cost| + json.partial! 'api/v2/plans/cost', cost: cost + end + end + + json.project [plan] do |pln| + json.partial! 'api/v2/plans/project', plan: pln + end + + outputs = plan.research_outputs.any? ? plan.research_outputs : [plan] + + json.dataset outputs do |output| + json.partial! "api/v2/datasets/show", output: output + end + + json.extension [plan.template] do |template| + json.set! :dmproadmap do + json.template do + json.id template.id + json.title template.title + end + end + + if @complete + json.complete_plan do + q_and_a = presenter.complete_plan_data + next if q_and_a.blank? + + json.array! q_and_a do |item| + json.question_id item[:id] + json.title item[:title] + json.section item[:section] + json.question item[:question] + json.answer item[:answer] + end + end + end + end +end diff --git a/app/views/api/v2/plans/index.json.jbuilder b/app/views/api/v2/plans/index.json.jbuilder new file mode 100644 index 0000000000..f19f41d1dc --- /dev/null +++ b/app/views/api/v2/plans/index.json.jbuilder @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +json.partial! 'api/v2/standard_response', total_items: @total_items + +json.items @items do |item| + json.dmp do + json.partial! 'api/v2/plans/show', plan: item + end +end diff --git a/app/views/api/v2/templates/index.json.jbuilder b/app/views/api/v2/templates/index.json.jbuilder new file mode 100644 index 0000000000..cdb35f54fb --- /dev/null +++ b/app/views/api/v2/templates/index.json.jbuilder @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +json.partial! 'api/v2/standard_response', total_items: @total_items + +json.items @items do |template| + presenter = Api::V2::TemplatePresenter.new(template: template) + + json.dmp_template do + json.title presenter.title + json.description template.description + json.version template.version + json.created template.created_at.to_formatted_s(:iso8601) + json.modified template.updated_at.to_formatted_s(:iso8601) + + json.affiliation do + json.partial! 'api/v2/orgs/show', org: template.org + end + + json.template_id do + identifier = Api::V2::ConversionService.to_identifier(context: @application, + value: template.id) + json.partial! 'api/v2/identifiers/show', identifier: identifier + end + end +end diff --git a/app/views/doorkeeper/applications/_delete_form.html.erb b/app/views/doorkeeper/applications/_delete_form.html.erb new file mode 100644 index 0000000000..b6377d35f5 --- /dev/null +++ b/app/views/doorkeeper/applications/_delete_form.html.erb @@ -0,0 +1,6 @@ +<%- submit_btn_css ||= 'btn btn-link' %> +<%= form_tag oauth_application_path(application), method: :delete do %> + <%= submit_tag t('doorkeeper.applications.buttons.destroy'), + onclick: "return confirm('#{ t('doorkeeper.applications.confirmations.destroy') }')", + class: submit_btn_css, style: "border-radius: 0;" %> +<% end %> \ No newline at end of file diff --git a/app/views/doorkeeper/applications/_form.html.erb b/app/views/doorkeeper/applications/_form.html.erb new file mode 100644 index 0000000000..5aeeeaf9ab --- /dev/null +++ b/app/views/doorkeeper/applications/_form.html.erb @@ -0,0 +1,42 @@ +<%= form_for application, url: doorkeeper_submit_path(application), as: :doorkeeper_application, html: { role: 'form' } do |f| %> + <% if application.errors.any? %> +

<%= t('doorkeeper.applications.form.error') %>

+ <% end %> + +
+ <%= f.label :name, class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_field :name, class: "form-control #{ 'is-invalid' if application.errors[:name].present? }", required: true, style: "border: 1px solid #ced4da;" %> + <%= doorkeeper_errors_for application, :name %> +
+
+ +
+ <%= f.label "Scope(s)", class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_field :scopes, class: "form-control #{ 'has-error' if application.errors[:scopes].present? }", style: "border: 1px solid #ced4da;" %> + <%= doorkeeper_errors_for application, :scopes %> + + <%= "Separate multiple scopes with spaces." %> + +
+
+ +
+ <%= f.label nil, 'Redirect URI(s)'.html_safe, class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_area :redirect_uri, class: "form-control #{ 'is-invalid' if application.errors[:redirect_uri].present? }", style: "border: 1px solid #ced4da;" %> + <%= doorkeeper_errors_for application, :redirect_uri %> + + <%= "Separate multiple URIs with spaces." %> + +
+
+ +
+
+ <%= f.submit t('doorkeeper.applications.buttons.submit'), class: 'btn btn-primary' %> + <%= link_to t('doorkeeper.applications.buttons.cancel'), oauth_applications_path, class: 'btn btn-secondary' %> +
+
+<% end %> \ No newline at end of file diff --git a/app/views/doorkeeper/applications/edit.html.erb b/app/views/doorkeeper/applications/edit.html.erb new file mode 100644 index 0000000000..95fb9ab2d5 --- /dev/null +++ b/app/views/doorkeeper/applications/edit.html.erb @@ -0,0 +1,5 @@ +
+

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

+
+ +<%= render 'form', application: @application %> \ No newline at end of file diff --git a/app/views/doorkeeper/applications/index.html.erb b/app/views/doorkeeper/applications/index.html.erb new file mode 100644 index 0000000000..835e0d917f --- /dev/null +++ b/app/views/doorkeeper/applications/index.html.erb @@ -0,0 +1,34 @@ +
+

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

+
+ +

<%= link_to t('.new'), new_oauth_application_path, class: 'btn btn-secondary', style: "border-radius: 0;" %>

+ + + + + + + + + + + + <% @applications.each do |application| %> + + + + + + + <% end %> + +
<%= t('.name') %><%= t('.callback_url') %><%= t('.actions') %>
+ <%= link_to application.name, oauth_application_path(application) %> + + <%= simple_format(application.redirect_uri) %> + + <%= link_to t('doorkeeper.applications.buttons.edit'), edit_oauth_application_path(application), class: 'btn btn-link' %> + + <%= render 'delete_form', application: application %> +
\ No newline at end of file diff --git a/app/views/doorkeeper/applications/new.html.erb b/app/views/doorkeeper/applications/new.html.erb new file mode 100644 index 0000000000..95fb9ab2d5 --- /dev/null +++ b/app/views/doorkeeper/applications/new.html.erb @@ -0,0 +1,5 @@ +
+

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

+
+ +<%= render 'form', application: @application %> \ No newline at end of file diff --git a/app/views/doorkeeper/applications/show.html.erb b/app/views/doorkeeper/applications/show.html.erb new file mode 100644 index 0000000000..71e06b573e --- /dev/null +++ b/app/views/doorkeeper/applications/show.html.erb @@ -0,0 +1,42 @@ +<%= fields_for @application, as: :doorkeeper_application, html: { role: 'form' } do |f| %> +
+ <%= f.label :name, class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_field :name, class: "form-control", required: true, style: "border: 1px solid #ced4da;", readonly: true %> +
+
+ +
+ <%= f.label nil, "Client ID".html_safe, class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_field :uid, class: "form-control", required: true, style: "border: 1px solid #ced4da;", readonly: true %> +
+
+ +
+ <%= f.label nil, "Client secret".html_safe, class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_field :secret, class: "form-control", required: true, style: "border: 1px solid #ced4da;", readonly: true %> +
+
+ +
+ <%= f.label "Scope(s)", class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_field :scopes, class: "form-control", style: "border: 1px solid #ced4da;", readonly: true %> +
+
+ +
+ <%= f.label nil, 'Redirect URI(s)'.html_safe, class: 'col-sm-2 col-form-label font-weight-bold' %> +
+ <%= f.text_area :redirect_uri, class: "form-control", style: "border: 1px solid #ced4da;", readonly: true %> +
+
+ +
+
+ <%= link_to "Back", oauth_applications_path, class: 'btn btn-secondary' %> +
+
+<% end %> \ No newline at end of file diff --git a/app/views/doorkeeper/authorizations/error.html.erb b/app/views/doorkeeper/authorizations/error.html.erb new file mode 100644 index 0000000000..4173caf8f2 --- /dev/null +++ b/app/views/doorkeeper/authorizations/error.html.erb @@ -0,0 +1,9 @@ +
+

<%= t('doorkeeper.authorizations.error.title') %>

+
+ +
+
+    <%= (local_assigns[:error_response] ? error_response : @pre_auth.error_response).body[:error_description] %>
+  
+
\ No newline at end of file diff --git a/app/views/doorkeeper/authorizations/form_post.html.erb b/app/views/doorkeeper/authorizations/form_post.html.erb new file mode 100644 index 0000000000..4b0df6c0c6 --- /dev/null +++ b/app/views/doorkeeper/authorizations/form_post.html.erb @@ -0,0 +1,15 @@ + + +<%= form_tag @pre_auth.redirect_uri, method: :post, name: :redirect_form, authenticity_token: false do %> + <% auth.body.compact.each do |key, value| %> + <%= hidden_field_tag key, value %> + <% end %> +<% end %> + + \ No newline at end of file diff --git a/app/views/doorkeeper/authorizations/new.html.erb b/app/views/doorkeeper/authorizations/new.html.erb new file mode 100644 index 0000000000..c7b8d0f224 --- /dev/null +++ b/app/views/doorkeeper/authorizations/new.html.erb @@ -0,0 +1,46 @@ + + +
+

+ <%= raw t('.prompt', client_name: content_tag(:strong, class: 'text-info') { @pre_auth.client.name }) %> +

+ + <% if @pre_auth.scopes.count > 0 %> +
+

<%= t('.able_to') %>:

+ + +
+ <% end %> + +
+ <%= form_tag oauth_authorization_path, method: :post do %> + <%= hidden_field_tag :client_id, @pre_auth.client.uid, id: nil %> + <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri, id: nil %> + <%= hidden_field_tag :state, @pre_auth.state, id: nil %> + <%= hidden_field_tag :response_type, @pre_auth.response_type, id: nil %> + <%= hidden_field_tag :response_mode, @pre_auth.response_mode, id: nil %> + <%= hidden_field_tag :scope, @pre_auth.scope, id: nil %> + <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge, id: nil %> + <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method, id: nil %> + <%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "btn btn-success mt-3 mb-3", style: "border-radius: 0;" %> + <% end %> + <%= form_tag oauth_authorization_path, method: :delete do %> + <%= hidden_field_tag :client_id, @pre_auth.client.uid, id: nil %> + <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri, id: nil %> + <%= hidden_field_tag :state, @pre_auth.state, id: nil %> + <%= hidden_field_tag :response_type, @pre_auth.response_type, id: nil %> + <%= hidden_field_tag :response_mode, @pre_auth.response_mode, id: nil %> + <%= hidden_field_tag :scope, @pre_auth.scope, id: nil %> + <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge, id: nil %> + <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method, id: nil %> + <%= submit_tag t('doorkeeper.authorizations.buttons.deny'), class: "btn btn-danger", style: "border-radius: 0;" %> + <% end %> +
+
\ No newline at end of file diff --git a/app/views/doorkeeper/authorizations/show.html.erb b/app/views/doorkeeper/authorizations/show.html.erb new file mode 100644 index 0000000000..385fc9f24b --- /dev/null +++ b/app/views/doorkeeper/authorizations/show.html.erb @@ -0,0 +1,7 @@ + + +
+ <%= params[:code] %> +
\ No newline at end of file diff --git a/app/views/doorkeeper/authorized_applications/_delete_form.html.erb b/app/views/doorkeeper/authorized_applications/_delete_form.html.erb new file mode 100644 index 0000000000..b39ef93edb --- /dev/null +++ b/app/views/doorkeeper/authorized_applications/_delete_form.html.erb @@ -0,0 +1,4 @@ +<%- submit_btn_css ||= 'btn btn-link' %> +<%= form_tag oauth_authorized_application_path(application), method: :delete do %> + <%= submit_tag t('doorkeeper.authorized_applications.buttons.revoke'), onclick: "return confirm('#{ t('doorkeeper.authorized_applications.confirmations.revoke') }')", class: submit_btn_css %> +<% end %> \ No newline at end of file diff --git a/app/views/doorkeeper/authorized_applications/index.html.erb b/app/views/doorkeeper/authorized_applications/index.html.erb new file mode 100644 index 0000000000..08e8429fd2 --- /dev/null +++ b/app/views/doorkeeper/authorized_applications/index.html.erb @@ -0,0 +1,24 @@ + + +
+ + + + + + + + + + <% @applications.each do |application| %> + + + + + + <% end %> + +
<%= t('doorkeeper.authorized_applications.index.application') %><%= t('doorkeeper.authorized_applications.index.created_at') %>
<%= application.name %><%= application.created_at.strftime(t('doorkeeper.authorized_applications.index.date_format')) %><%= render 'delete_form', application: application %>
+
\ No newline at end of file diff --git a/app/views/layouts/_branding.html.erb b/app/views/layouts/_branding.html.erb index 62ff6493f8..d4bc492b1e 100644 --- a/app/views/layouts/_branding.html.erb +++ b/app/views/layouts/_branding.html.erb @@ -114,6 +114,9 @@ <% end %> <% if current_user.can_super_admin? %> + diff --git a/config/application.rb b/config/application.rb index 708e3675db..0eb3cb864a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -53,5 +53,12 @@ class Application < Rails::Application # Set the default host for mailer URLs config.action_mailer.default_url_options = { host: Socket.gethostname.to_s } + + # apply application styling to doorkeeper views + config.to_prepare do + Doorkeeper::ApplicationsController.layout "application" + Doorkeeper::AuthorizationsController.layout "application" + Doorkeeper::AuthorizedApplicationsController.layout "application" + end end end diff --git a/config/database.yml.sample b/config/database.yml.sample index ea0354e1d4..0e81a500bb 100644 --- a/config/database.yml.sample +++ b/config/database.yml.sample @@ -13,3 +13,4 @@ development: test: <<: *defaults + database: <%= ENV.fetch('TEST_DB_NAME', 'roadmap_test') %> diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb new file mode 100644 index 0000000000..887239f1fd --- /dev/null +++ b/config/initializers/doorkeeper.rb @@ -0,0 +1,49 @@ +# frozen_string_literal: true + +Doorkeeper.configure do + # set the object-relational-model (ORM) + orm :active_record + + # ensure resource owner is authenticated + resource_owner_authenticator do + if request.path == native_oauth_authorization_path + # Deactivate native_oauth_authorization_path (intended for mobile devices) + redirect_to root_path, alert: "You are not authorized to perform this action." + else + # https://doorkeeper.gitbook.io/guides/ruby-on-rails/configuration + current_user || warden.authenticate!(scope: :user) + end + end + + # ensure only super-admins can manage oauth applications + admin_authenticator do |_routes| + redirect_to root_path, alert: "You are not authorized to perform this action." unless current_user&.can_super_admin? + end + + # grant flows enabled + # Authorization Code Grant Flow (ACGF) + grant_flows %w[authorization_code client_credentials] + + # allow for redirect-uri to be blank + # (required for client_credentials apps for org-admins) + allow_blank_redirect_uri true + + # scopes enabled + default_scopes :read + + # ensure client apps cannot ask for scopes outwith those specified here + enforce_configured_scopes + + # set the token endpoint configurations + access_token_expires_in 2.hours + + # enable refresh tokens of duration 90 days + use_refresh_token expiry: 90.days + + # enable ssl requirement for redirect url + # - Allow HTTP in test and development environments + force_ssl_in_redirect_uri !(Rails.env.test? || Rails.env.development?) + + hash_application_secrets + hash_token_secrets +end diff --git a/config/locale/app.pot b/config/locale/app.pot index 2d2bda03d4..24563216d5 100644 --- a/config/locale/app.pot +++ b/config/locale/app.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 13:28-0600\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 08:33-0700\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -123,87 +123,95 @@ msgstr "" msgid "No Plans found" msgstr "" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "" -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "" -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "" -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "" @@ -244,77 +252,77 @@ msgstr "" msgid "Unable to submit your request" msgstr "" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "" @@ -328,7 +336,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -344,7 +352,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -383,7 +391,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -397,7 +405,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -438,19 +446,19 @@ msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -540,7 +548,7 @@ msgid "Unable to delete this version of the template." msgstr "" #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "" @@ -549,11 +557,11 @@ msgstr "" msgid "That template is no longer customizable." msgstr "" -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "" -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "" @@ -643,33 +651,33 @@ msgstr "" msgid "template with customisations by the" msgstr "" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" msgstr "" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "" @@ -754,7 +762,7 @@ msgstr "" msgid "research output not found" msgstr "" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -917,27 +925,27 @@ msgstr "" msgid "Unable to link your account to %{scheme}." msgstr "" -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "" @@ -1217,50 +1225,50 @@ msgstr "" msgid "Last 12 months" msgstr "" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "" @@ -1490,15 +1498,15 @@ msgstr "" msgid "already assigned a value" msgstr "" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "" @@ -1622,7 +1630,7 @@ msgstr "" msgid "Conditions in the template refer backwards" msgstr "" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "" @@ -2032,7 +2040,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4351,7 +4359,7 @@ msgstr "" msgid "Instructions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "" @@ -4359,71 +4367,71 @@ msgstr "" msgid "Download settings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/de/LC_MESSAGES/app.mo b/config/locale/de/LC_MESSAGES/app.mo index 24a717f3c7..7d1cecb7bc 100644 Binary files a/config/locale/de/LC_MESSAGES/app.mo and b/config/locale/de/LC_MESSAGES/app.mo differ diff --git a/config/locale/de/app.po b/config/locale/de/app.po index ec4ab0e7b8..2c4dae7d3c 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: German\n" "Language: de\n" @@ -129,87 +129,95 @@ msgstr "Ungültiger JSON" msgid "No Plans found" msgstr "Keine Pläne gefunden" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Sie sind nicht berechtigt, diese Aktion durchzuführen." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Bitte melden Sie sich an oder registrieren Sie sich bevor Sie fortfahren." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "%{action} %{object} kann nicht ausgeführt werden. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "Erfolgreich %{action} das %{object}." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "API-Client" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "Plan" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "Hinweisgruppe" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "Kommentar" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "Organisation" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "Berechtigung" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "Einstellungen" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "Profil" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "Nutzer/in" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "Frage Option" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Aufnahme nicht gefunden" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "Der Bereich sollte ein ActiveRecord :: Relation-Objekt sein" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params sollte ein Hash-Objekt sein" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params sollte ein Hash-Objekt sein" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "Einheimische sollten ein Hash-Objekt sein" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Eingeschränkter Zugriff auf Alle Datensätze anzeigen" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Sortieren nach %{sort_field}" @@ -252,77 +260,77 @@ msgstr "Die Nachricht wurde erfolgreich versendet." msgid "Unable to submit your request" msgstr "Ihre Anfrage konnte nicht gesendet werden" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "Hinzufügen" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "Hinzugefügt" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "gespeichert" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "Speichern" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "entfernt" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "entfernen" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "Plan nicht gefunden" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "Mitwirkender nicht gefunden" @@ -336,7 +344,7 @@ msgstr "Bei der Anforderung von Feedback für diesen Plan ist ein Fehler aufgetr #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -352,7 +360,7 @@ msgstr "Erstellt" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -395,7 +403,7 @@ msgstr "Veröffentlichung zurückziehen" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -409,7 +417,7 @@ msgstr "Gelöscht" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -454,19 +462,19 @@ msgstr "Es kann keine neue Version dieser Vorlage erstellt werden.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "aktualisiert" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -562,7 +570,7 @@ msgid "Unable to delete this version of the template." msgstr "Diese Version der Vorlage kann nicht gelöscht werden." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "Kopieren" @@ -571,11 +579,11 @@ msgstr "Kopieren" msgid "That template is no longer customizable." msgstr "Diese Vorlage ist nicht mehr anpassbar." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Diese Vorlage kann nicht angepasst werden." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Diese Vorlage ist nicht anpassbar." @@ -667,11 +675,11 @@ msgstr "Dieser Plan basiert auf dem" msgid "template with customisations by the" msgstr "Vorlage mit Anpassungen durch die" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "Kopiert" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -679,23 +687,23 @@ msgstr "" "Der Status des Plans konnte nicht geändert werden, da mindestens %{percentage}" " Prozentsatz angefordert wurde" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "Plan-ID konnte nicht gefunden werden %{plan_id}" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Ihr Projekt ist jetzt ein Test." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Ihr Projekt ist kein Test mehr." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Der Teststatus des Plans konnte nicht geändert werden" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "ID %{ ist kein Plan zugeordnet S" @@ -792,7 +800,7 @@ msgstr "Passwort und Bestätigung müssen übereinstimmen" msgid "research output not found" msgstr "Forschungsergebnis nicht gefunden" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -973,27 +981,27 @@ msgstr "Ihr Konto wurde erfolgreich mit %{scheme} verknüpft." msgid "Unable to link your account to %{scheme}." msgstr "Ihr Konto konnte nicht mit %{scheme} verknüpft werden." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "Erfolgreich %{action} %{username} Konto." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "Aktiviert" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "Deaktiviert" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "Kann nicht zu %{action} %{username}" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "Aktivieren" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "Deaktivieren" @@ -1286,50 +1294,50 @@ msgstr "Letzte 9 Monate" msgid "Last 12 months" msgstr "Letzte 12 Monate" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "Abfrage oder Feedback zu %{tool_name}" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Willkommen bei %{tool_name}" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "Ein Datenverwaltungsplan in %{tool_name} wurde mit Ihnen geteilt" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "Berechtigungen für einen Datenverwaltungsplan in %{tool_name} geändert" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "Berechtigungen für ein DMP in %{tool_name} entfernt" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name} hat um Feedback zu einem %{tool_name}-Plan gebeten" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name}: Es wurde Experten-Feedback für %{plan_title} gegeben." -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "DMP-Sichtbarkeit geändert: %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: Ein neuer Kommentar wurde zu %{plan_title} hinzugefügt." -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Administratorrechte in erteilt %{tool_name}" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "%{tool_name} API-Änderungen" @@ -1569,15 +1577,15 @@ msgstr "" msgid "already assigned a value" msgstr "bereits einen Wert zugewiesen" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Feedback-Nachricht" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "muss eines der folgenden Formate sein: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "kann nicht größer als 500KB sein" @@ -1703,7 +1711,7 @@ msgstr "Sie können keine Vorlage veröffentlichen, die Abschnitte ohne Fragen e msgid "Conditions in the template refer backwards" msgstr "Die Bedingungen in der Vorlage beziehen sich rückwärts" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "Ein Datenmanagementplan in %{application_name} wurde für Sie freigegeben" @@ -2133,7 +2141,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4667,7 +4675,7 @@ msgstr "Kommentare & Anleitung" msgid "Instructions" msgstr "Anleitung" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Format" @@ -4675,73 +4683,73 @@ msgstr "Format" msgid "Download settings" msgstr "Einstellungen herunterladen" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Wählen Sie die Phase zum Herunterladen aus" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "Optionale Plankomponenten" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "Deckblatt Projektdetails" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "Fragetext und Abschnittsüberschriften" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "unbeantwortete Fragen" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "Forschungsergebnisse" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "" "ergänzende(r) Abschnitt(e), die von der Förderorganisation nicht gefordert wer" "den" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Wählen Sie die Phase zum Herunterladen aus" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "PDF-Formatierung" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Schrift" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Rand (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Schriftart" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Größe" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Oben" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Seitenende" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Links" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Rechts" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/en/LC_MESSAGES/app.mo b/config/locale/en/LC_MESSAGES/app.mo index 83532d79fa..a5667b9c27 100644 Binary files a/config/locale/en/LC_MESSAGES/app.mo and b/config/locale/en/LC_MESSAGES/app.mo differ diff --git a/config/locale/en/app.po b/config/locale/en/app.po index 90661f9691..5833e9b41d 100644 --- a/config/locale/en/app.po +++ b/config/locale/en/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 13:28-0600\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 08:33-0700\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en\n" @@ -127,87 +127,95 @@ msgstr "Invalid JSON" msgid "No Plans found" msgstr "No Plans found" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "There was a problem in the server." + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "The client is not authorized to perform this action." + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "You are not authorized to perform this action." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "You need to sign in or sign up before continuing." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "Unable to %{action} the %{object}. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "Successfully %{action} the %{object}." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "API client" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "plan" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "guidance group" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "comment" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organisation" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "permission" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "preferences" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "profile" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "user" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "question option" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Record Not Found" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "scope should be an ActiveRecord::Relation object" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params should be a Hash object" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params should be a Hash object" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "locals should be a Hash object" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Restricted access to View All the records" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Sort by %{sort_field}" @@ -248,77 +256,77 @@ msgstr "Contact email was successfully sent." msgid "Unable to submit your request" msgstr "Unable to submit your request" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "add" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "added" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "saved" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "save" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "removed" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "remove" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "plan not found" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "contributor not found" @@ -332,7 +340,7 @@ msgstr "An error occurred when requesting feedback for this plan." #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -348,7 +356,7 @@ msgstr "created" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -387,7 +395,7 @@ msgstr "unpublish" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -401,7 +409,7 @@ msgstr "deleted" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -444,19 +452,19 @@ msgstr "Unable to create a new version of this template.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "updated" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -546,7 +554,7 @@ msgid "Unable to delete this version of the template." msgstr "Unable to delete this version of the template." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "copy" @@ -555,11 +563,11 @@ msgstr "copy" msgid "That template is no longer customizable." msgstr "That template is no longer customizable." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Unable to customize that template." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "That template is not customizable." @@ -649,11 +657,11 @@ msgstr "This plan is based on the" msgid "template with customisations by the" msgstr "template with customisations by the" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "copied" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -661,23 +669,23 @@ msgstr "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "Unable to find plan id %{plan_id}" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Your project is now a test." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Your project is no longer a test." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Unable to change the plan's test status" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "There is no plan associated with id %{s" @@ -775,7 +783,7 @@ msgstr "Password and comfirmation must match" msgid "research output not found" msgstr "research output not found" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -952,27 +960,27 @@ msgstr "Your account has been successfully linked to %{scheme}." msgid "Unable to link your account to %{scheme}." msgstr "Unable to link your account to %{scheme}." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "Successfully %{action} %{username}'s account." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "activated" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "deactivated" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "Unable to %{action} %{username}" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "activate" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "deactivate" @@ -1266,50 +1274,50 @@ msgstr "Last 9 months" msgid "Last 12 months" msgstr "Last 12 months" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "Query or feedback related to %{tool_name}" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Welcome to %{tool_name}" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "A Data Management Plan in %{tool_name} has been shared with you" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "Changed permissions on a Data Management Plan in %{tool_name}" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "Permissions removed on a DMP in %{tool_name}" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name} has requested feedback on a %{tool_name} plan" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name}: Expert feedback has been provided for %{plan_title}" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "DMP Visibility Changed: %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: A new comment was added to %{plan_title}" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Administrator privileges granted in %{tool_name}" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "%{tool_name} API changes" @@ -1549,15 +1557,15 @@ msgstr "Question not answered.\\n" msgid "already assigned a value" msgstr "already assigned a value" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Feedback email message" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "must be one of the following formats: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "can't be larger than 500KB" @@ -1681,7 +1689,7 @@ msgstr "You can not publish a template without questions in a section. " msgid "Conditions in the template refer backwards" msgstr "Conditions in the template refer backwards" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "A Data Management Plan in %{application_name} has been shared with you" @@ -2114,7 +2122,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4612,7 +4620,7 @@ msgstr "Comments & Guidance" msgid "Instructions" msgstr "Instructions" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Format" @@ -4620,71 +4628,71 @@ msgstr "Format" msgid "Download settings" msgstr "Download settings" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Select phase to download" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "Optional plan components" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "project details coversheet" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "question text and section headings" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "unanswered questions" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "research outputs" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "supplementary section(s) not requested by funding organisation" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Select phase to download" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "PDF formatting" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Font" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Margin (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Face" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Size" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Top" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Bottom" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Left" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Right" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/en_CA/LC_MESSAGES/app.mo b/config/locale/en_CA/LC_MESSAGES/app.mo index bf9d6b2adf..aa7816ac0c 100644 Binary files a/config/locale/en_CA/LC_MESSAGES/app.mo and b/config/locale/en_CA/LC_MESSAGES/app.mo differ diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po index 8ab07d0dae..9481090fbb 100644 --- a/config/locale/en_CA/app.po +++ b/config/locale/en_CA/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_CA\n" @@ -123,87 +123,95 @@ msgstr "" msgid "No Plans found" msgstr "" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "" -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "You need to sign in or sign up before continuing." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "" -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "" @@ -244,77 +252,77 @@ msgstr "" msgid "Unable to submit your request" msgstr "" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "" @@ -328,7 +336,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -344,7 +352,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -383,7 +391,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -397,7 +405,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -438,19 +446,19 @@ msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -540,7 +548,7 @@ msgid "Unable to delete this version of the template." msgstr "" #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "" @@ -549,11 +557,11 @@ msgstr "" msgid "That template is no longer customizable." msgstr "" -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "" -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "" @@ -643,33 +651,33 @@ msgstr "" msgid "template with customisations by the" msgstr "" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" msgstr "" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "" @@ -754,7 +762,7 @@ msgstr "" msgid "research output not found" msgstr "" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -917,27 +925,27 @@ msgstr "" msgid "Unable to link your account to %{scheme}." msgstr "" -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "" @@ -1217,50 +1225,50 @@ msgstr "" msgid "Last 12 months" msgstr "" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "" @@ -1490,15 +1498,15 @@ msgstr "" msgid "already assigned a value" msgstr "" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "" @@ -1622,7 +1630,7 @@ msgstr "" msgid "Conditions in the template refer backwards" msgstr "" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "" @@ -2032,7 +2040,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4351,7 +4359,7 @@ msgstr "" msgid "Instructions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "" @@ -4359,71 +4367,71 @@ msgstr "" msgid "Download settings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" @@ -4965,15 +4973,15 @@ msgstr "" #: ../../app/views/research_outputs/repositories/_search.html.erb:6 msgid "Select a subject area to refine your search." -msgstr "" +msgstr "Select a subject area to refine your search." #: ../../app/views/research_outputs/repositories/_search.html.erb:12 msgid "- Select a subject area -" -msgstr "" +msgstr "- Select a subject area -" #: ../../app/views/research_outputs/repositories/_search.html.erb:14 msgid "Select a subject area" -msgstr "" +msgstr "Select a subject area" #: ../../app/views/research_outputs/repositories/_search.html.erb:22 msgid "- Select a repository type -" diff --git a/config/locale/en_GB/LC_MESSAGES/app.mo b/config/locale/en_GB/LC_MESSAGES/app.mo index eca3c2e99f..21dda0e166 100644 Binary files a/config/locale/en_GB/LC_MESSAGES/app.mo and b/config/locale/en_GB/LC_MESSAGES/app.mo differ diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po index 7479db1f41..465f877b67 100644 --- a/config/locale/en_GB/app.po +++ b/config/locale/en_GB/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_GB\n" @@ -123,87 +123,95 @@ msgstr "" msgid "No Plans found" msgstr "" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "" -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "You need to sign in or sign up before continuing." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "" -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "" @@ -244,77 +252,77 @@ msgstr "Contact email was successfully sent." msgid "Unable to submit your request" msgstr "" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "" @@ -328,7 +336,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -344,7 +352,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -383,7 +391,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -397,7 +405,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -438,19 +446,19 @@ msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -540,7 +548,7 @@ msgid "Unable to delete this version of the template." msgstr "" #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "" @@ -549,11 +557,11 @@ msgstr "" msgid "That template is no longer customizable." msgstr "That template is no longer customisable." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Unable to customise that template" -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "That template is not customisable" @@ -643,33 +651,33 @@ msgstr "" msgid "template with customisations by the" msgstr "" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" msgstr "" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "" @@ -754,7 +762,7 @@ msgstr "" msgid "research output not found" msgstr "" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -917,27 +925,27 @@ msgstr "" msgid "Unable to link your account to %{scheme}." msgstr "" -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "" @@ -1217,50 +1225,50 @@ msgstr "" msgid "Last 12 months" msgstr "" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "" @@ -1490,15 +1498,15 @@ msgstr "" msgid "already assigned a value" msgstr "" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "" @@ -1622,7 +1630,7 @@ msgstr "" msgid "Conditions in the template refer backwards" msgstr "" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "" @@ -2032,7 +2040,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4353,7 +4361,7 @@ msgstr "" msgid "Instructions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "" @@ -4361,71 +4369,71 @@ msgstr "" msgid "Download settings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/en_US/LC_MESSAGES/app.mo b/config/locale/en_US/LC_MESSAGES/app.mo index 4312126274..e5c4383c22 100644 Binary files a/config/locale/en_US/LC_MESSAGES/app.mo and b/config/locale/en_US/LC_MESSAGES/app.mo differ diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index 1626c14e2e..321ef003b5 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_US\n" @@ -123,87 +123,95 @@ msgstr "" msgid "No Plans found" msgstr "" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "" -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "You need to sign in or sign up before continuing." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "" -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organization" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "" @@ -244,77 +252,77 @@ msgstr "Contact email was successfully sent." msgid "Unable to submit your request" msgstr "" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "" @@ -328,7 +336,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -344,7 +352,7 @@ msgstr "" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -383,7 +391,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -397,7 +405,7 @@ msgstr "" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -438,19 +446,19 @@ msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -540,7 +548,7 @@ msgid "Unable to delete this version of the template." msgstr "" #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "" @@ -549,11 +557,11 @@ msgstr "" msgid "That template is no longer customizable." msgstr "That template is no longer customizable." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Unable to customize that template." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "That template is not customizable." @@ -643,33 +651,33 @@ msgstr "" msgid "template with customisations by the" msgstr "" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" msgstr "" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "" -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "" @@ -756,7 +764,7 @@ msgstr "" msgid "research output not found" msgstr "" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -921,27 +929,27 @@ msgstr "" msgid "Unable to link your account to %{scheme}." msgstr "" -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "" @@ -1221,50 +1229,50 @@ msgstr "" msgid "Last 12 months" msgstr "" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "" @@ -1494,15 +1502,15 @@ msgstr "" msgid "already assigned a value" msgstr "" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "" @@ -1626,7 +1634,7 @@ msgstr "" msgid "Conditions in the template refer backwards" msgstr "" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "" @@ -2036,7 +2044,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4396,7 +4404,7 @@ msgstr "" msgid "Instructions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "" @@ -4404,71 +4412,71 @@ msgstr "" msgid "Download settings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "supplementary section(s) not requested by funding organization" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/es/LC_MESSAGES/app.mo b/config/locale/es/LC_MESSAGES/app.mo index 7199660719..5da2fa1dff 100644 Binary files a/config/locale/es/LC_MESSAGES/app.mo and b/config/locale/es/LC_MESSAGES/app.mo differ diff --git a/config/locale/es/app.po b/config/locale/es/app.po index d381a6a36e..bd30a3a3bb 100644 --- a/config/locale/es/app.po +++ b/config/locale/es/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Spanish\n" "Language: es\n" @@ -127,87 +127,95 @@ msgstr "JSON inválido" msgid "No Plans found" msgstr "No se encontraron planes" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Usted no está autorizado para realizar esta acción." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Necesita iniciar sesión o registrarse para continuar." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "No se puede %{action} el %{object}. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "Con éxito %{action} el %{object}." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "Cliente API" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "Plan" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "grupo de orientación" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "Comentario" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organización" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "permiso" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "Preferencias" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "Perfil" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "user" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "opción de pregunta" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Registro no encontrado" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "el alcance debe ser un objeto ActiveRecord :: Relation" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params debe ser un objeto Hash" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params debe ser un objeto Hash" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "los locales deberían ser un objeto Hash" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Acceso restringido a Ver todos los registros." -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Ordenar por %{sort_field}" @@ -248,77 +256,77 @@ msgstr "El correo electrónico de contacto fue enviado con éxito." msgid "Unable to submit your request" msgstr "No se puede enviar su solicitud" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "Añadir" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "Adicional" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "Guardado" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "Guardar" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "remoto" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "Quitar" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "Plan no encontrado" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "contribuyente no encontrado" @@ -332,7 +340,7 @@ msgstr "Se produjo un error al solicitar comentarios para este plan." #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -348,7 +356,7 @@ msgstr "creado" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -391,7 +399,7 @@ msgstr "Despublicar" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -405,7 +413,7 @@ msgstr "Suprimido" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -446,19 +454,19 @@ msgstr "No se puede crear una nueva versión de esta plantilla.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "Actualizado" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -550,7 +558,7 @@ msgid "Unable to delete this version of the template." msgstr "No se puede eliminar esta versión de la plantilla." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "Dupdo" @@ -559,11 +567,11 @@ msgstr "Dupdo" msgid "That template is no longer customizable." msgstr "Esa plantilla ya no es personalizable." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "No se puede personalizar esa plantilla." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Esa plantilla no es personalizable." @@ -655,11 +663,11 @@ msgstr "Este plan se basa en el" msgid "template with customisations by the" msgstr "plantilla con personalizaciones por el" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "copiado" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -667,23 +675,23 @@ msgstr "" "No se puede cambiar el estado del plan ya que se necesita al menos el porcenta" "je %{percentage} respondido" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "No se puede encontrar la identificación del plan %{plan_id}" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Tu proyecto es ahora una prueba." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Tu proyecto ya no es una prueba." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "No se puede cambiar el estado de prueba del plan" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "No hay plan asociado con id %{ s" @@ -781,7 +789,7 @@ msgstr "La contraseña y la confirmación deben coincidir" msgid "research output not found" msgstr "resultado de la investigación no encontrado" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -960,27 +968,27 @@ msgstr "Su cuenta se ha vinculado con éxito a %{scheme}." msgid "Unable to link your account to %{scheme}." msgstr "No se puede vincular su cuenta a %{scheme}." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "Con éxito la cuenta de %{action} %{username}." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "activado" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "Desactivado" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "No se puede %{action} %{username}" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "Activar" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "Desactivar" @@ -1273,50 +1281,50 @@ msgstr "Últimos 9 meses" msgid "Last 12 months" msgstr "Últimos 12 meses" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "Consulta o feedback relacionado con %{tool_name}" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Bienvenido a %{tool_name}" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "Se ha compartido con usted un Plan de gestión de datos en %{tool_name}" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "Cambios de permisos en un plan de gestión de datos en %{tool_name}" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "Permisos eliminados en un DMP en %{tool_name}" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name} ha solicitado comentarios sobre un plan %{tool_name}" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name}: Se han proporcionado comentarios de expertos para %{plan_title}" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "Se modificó la visibilidad de DMP: %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: Se agregó un nuevo comentario a %{plan_title}" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Privilegios de administrador otorgados en %{tool_name}" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "%{tool_name} Cambios de API" @@ -1556,15 +1564,15 @@ msgstr "" msgid "already assigned a value" msgstr "ya asignado un valor" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Mensaje de correo electrónico de comentarios" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "debe ser uno de los siguientes formatos: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "no puede ser más grande que 500KB" @@ -1690,7 +1698,7 @@ msgstr "No se puede publicar una plantilla sin preguntas en una sección." msgid "Conditions in the template refer backwards" msgstr "Las condiciones en la plantilla se refieren al revés" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "Se ha compartido un plan de gestión de datos en %{application_name} con usted" @@ -2120,7 +2128,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4633,7 +4641,7 @@ msgstr "Comentarios y orientación" msgid "Instructions" msgstr "Instrucciones" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Formato" @@ -4641,71 +4649,71 @@ msgstr "Formato" msgid "Download settings" msgstr "Descargar ajustes" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Seleccione la fase para descargar" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "Componentes opcionales del plan" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "detalles del proyecto portada" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "texto de la pregunta y encabezados de sección" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "preguntas sin respuesta" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "resultados de la investigación" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "Secciones complementarias no solicitadas por la organización financiadora" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Seleccione la fase para descargar" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "Formato PDF" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Fuente" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Margen (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Estilo" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Tamaño" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Superior" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Inferior" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Izquierdo" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Derecho" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/fi/LC_MESSAGES/app.mo b/config/locale/fi/LC_MESSAGES/app.mo index bf7f0bf1d1..1e5af65c72 100644 Binary files a/config/locale/fi/LC_MESSAGES/app.mo and b/config/locale/fi/LC_MESSAGES/app.mo differ diff --git a/config/locale/fi/app.po b/config/locale/fi/app.po index da6ecaa6c3..b2c9d08948 100644 --- a/config/locale/fi/app.po +++ b/config/locale/fi/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -129,87 +129,95 @@ msgstr "Virheellinen JSON" msgid "No Plans found" msgstr "Suunnitelmia ei löytynyt" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "Palvelimella oli ongelma." + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "Asiakkaalla ei ole oikeutta suorittaa tätä toimintoa." + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Sinulla ei ole oikeuksia suorittaa tätä toimintoa." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Kirjaudu sisään tai rekisteröidy jatkaaksesi." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "Ei voida %{action} %{object}. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "%{object}:n %{action} onnistui." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "API-asiakas" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "suunnitelma" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "ohjeryhmä" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "kommentti" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organisaatio" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "käyttöoikeus" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "asetukset" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "käyttäjätiedot" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "käyttäjä" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "kysymysvaihtoehto" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Levyä ei löydy" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "kohteen pitäisi olla ActiveRecord::Relation object" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params pitäisi olla Hash object" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params pitäisi olla Hash object" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "paikalliset pitäisi olla Hash objekti" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Kaikkien tietojen tarkastelu on rajoitettu" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Järjestä %{sort_field}" @@ -250,77 +258,77 @@ msgstr "Sähköpostin lähettäminen onnistui." msgid "Unable to submit your request" msgstr "Pyyntösi ei onnistu" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "lisätä" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "lisä-" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "tallennettu" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "tallenna" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "poistettu" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "poista" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "Suunnitelmaa ei löytynyt" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "osallistujaa ei löytynyt" @@ -334,7 +342,7 @@ msgstr "Tapahtui virhe, kun pyysit palautetta tälle suunnitelmalle." #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -350,7 +358,7 @@ msgstr "luominen" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -389,7 +397,7 @@ msgstr "piilota" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -403,7 +411,7 @@ msgstr "poistettu" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -446,19 +454,19 @@ msgstr "Tästä mallista ei voi luoda uutta versiota.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "päivitetty" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -548,7 +556,7 @@ msgid "Unable to delete this version of the template." msgstr "Tätä mallin versiota ei voi poistaa." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "kopio" @@ -557,11 +565,11 @@ msgstr "kopio" msgid "That template is no longer customizable." msgstr "Suunnitelmapohjaa ei voi enää mukauttaa." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Suunnitelmapohjan mukauttaminen ei onnistu." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Suunnitelmapohjaa ei voi mukauttaa." @@ -653,11 +661,11 @@ msgstr "Suunnitelma perustuu" msgid "template with customisations by the" msgstr "malli asiakassuhteiden mukauttamisella" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "kopionti" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -665,23 +673,23 @@ msgstr "" "Suunnitelman tilan muuttaminen ei onnistunut, koska vähintään %{percentage}:a " "vastauksista pitää olla vastattuna" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "Suunnitelman tunnistetta %{plan_id} ei löydy" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Projektisi on nyt testimuodossa." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Projektisi ei ole enää testimuodossa." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Suunnitelman testistatuksen muuttaminen ei onnistu" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "Tunnukseen %{ ei liity suunnitelmaa s" @@ -775,7 +783,7 @@ msgstr "Salasanan ja sen vahvistuksen on oltava samoja" msgid "research output not found" msgstr "tutkimustulosta ei löytynyt" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -950,27 +958,27 @@ msgstr "Tilisi liitettiin onnistuneesti %{scheme}:n." msgid "Unable to link your account to %{scheme}." msgstr "Tilisi liittäminen %{scheme}:hin ei onnistunut." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "%{username}n tilin %{action} onnistui." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "aktivoitu" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "pois käytöstä" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "%{username}:n %{action} ei onnistunut" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "aktivoi" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "kytke pois päältä" @@ -1262,52 +1270,52 @@ msgstr "Viimeiset 9 kuukautta" msgid "Last 12 months" msgstr "Viimeiset 12 kuukautta" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "%{tool_name}:n liittyvä kysymys tai palaute" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Tervetuloa %{tool_name}:n käyttäjäksi" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "Tiedonhallintasuunnitelma %{tool_name} -palvelussa on jaettu kanssasi" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "" "%{tool_name}:ssa olevan aineistonhallintasuunnitelman käyttöoikeuksia on muute" "ttu" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "DMP: ltä poistetut käyttöoikeudet %{tool_name}" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name} on pyytänyt palautetta %{tool_name} -suunnitelmasta" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name}: %{plan_title}: lle on annettu asiantuntijapalautetta" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "Suunnitelman näkyvyys on muuttunut: %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: Uusi kommentti lisättiin suunnitelmaasi %{plan_title}" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Minulle myönnetyt ylläpito-oikeudet %{tool_name}:ssa" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "%{tool_name} API-muutokset" @@ -1543,15 +1551,15 @@ msgstr "Kysymykseen ei vastattu.\\n" msgid "already assigned a value" msgstr "jo määritetty arvo" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Palautteen sähköpostiviesti" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "täytyy olla yksi seuraavista tiedostomuodoista: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "ei voi olla suurempi kuin 500KB" @@ -1675,7 +1683,7 @@ msgstr "Et voi julkaista mallipohjaa ilman kysymyksiä." msgid "Conditions in the template refer backwards" msgstr "Mallin ehdot viittaavat taaksepäin" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "" "%{application_name}lla kirjoitettu aineistonhallintasuunnitelma on jaettu kans" @@ -2107,7 +2115,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4606,7 +4614,7 @@ msgstr "Kommentit ja ohjeet" msgid "Instructions" msgstr "Ohjeet" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Tiedostomuoto" @@ -4614,72 +4622,72 @@ msgstr "Tiedostomuoto" msgid "Download settings" msgstr "Asetukset" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Valitse vaihe ladattavaksi" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "" "Valinnaiset suunnitelman osat\n" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "Projektin tiedot" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "Kysymyksen teksti ja osioiden otsikot" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "Vastaamattomat kysymykset" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "tutkimustuloksista" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "lisäosiot, joita rahoittajat eivät edellytä" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Valitse vaihe ladattavaksi" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "PDF:n muotoilu" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Fontti" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Marginaali (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Kirjasinlaji" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Koko" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Yläosa" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Alaosa" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Vasen" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Oikea" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/fr_CA/LC_MESSAGES/app.mo b/config/locale/fr_CA/LC_MESSAGES/app.mo index e5da555337..f31748c286 100644 Binary files a/config/locale/fr_CA/LC_MESSAGES/app.mo and b/config/locale/fr_CA/LC_MESSAGES/app.mo differ diff --git a/config/locale/fr_CA/app.po b/config/locale/fr_CA/app.po index dbea8d0b50..b71a5b7820 100644 --- a/config/locale/fr_CA/app.po +++ b/config/locale/fr_CA/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: French\n" "Language: fr_CA\n" @@ -127,87 +127,95 @@ msgstr "Format JSON invalide" msgid "No Plans found" msgstr "Aucun plan n’a été trouvé" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Vous n’êtes pas autorisé à effectuer cette action." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Vous devez vous connecter ou vous inscrire pour continuer." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "La mesure %{action} pour %{object} a été effectuée avec succès." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "Client API" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "plan" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "groupe de directives" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "laisser un commentaire" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organisme" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "autorisation" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "préférences" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "profil" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "utilisateur(trice)" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "choix de questions" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "la portée doit être un objet ActiveRecord::Relation" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params doit être un objet Hash" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params doit constituer un objet Hash" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "les valeurs locales doivent être un objet Hash" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Accès restreint à Voir Tous les enregistrements" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Trier par %{sort_field}" @@ -250,77 +258,77 @@ msgstr "Le courriel du contact a été envoyé avec succès." msgid "Unable to submit your request" msgstr "Il est impossible de soumettre votre demande" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "ajouter" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "ajouté" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "enregistré" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "enregistrer" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "retiré" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "retirer" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "plan non trouvé" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "contributeur introuvable" @@ -334,7 +342,7 @@ msgstr "Une erreur s’est produite lors de la demande de commentaires pour ce p #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -350,7 +358,7 @@ msgstr "créé" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -393,7 +401,7 @@ msgstr "annuler la publication" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -407,7 +415,7 @@ msgstr "supprimé" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -454,19 +462,19 @@ msgstr "" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "mis à jour" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -560,7 +568,7 @@ msgid "Unable to delete this version of the template." msgstr "" #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "copier" @@ -569,11 +577,11 @@ msgstr "copier" msgid "That template is no longer customizable." msgstr "Ce modèle n’est plus personnalisable." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Il est impossible de personnaliser ce modèle." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Ce modèle n’est pas personnalisable." @@ -665,11 +673,11 @@ msgstr "Ce plan est fondé sur " msgid "template with customisations by the" msgstr "modèle avec des personnalisations par le" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "copié" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -677,23 +685,23 @@ msgstr "" "Il est impossible de modifier l’état du plan, car il est nécessaire d’obtenir " "un taux de réponse d’au moins %{percentage}" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "Il est impossible de trouver l’ID du plan %{plan_id}" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Votre projet est maintenant à l’état d’essai." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Votre projet n’est plus à l’état d’essai." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Il est impossible de modifier l’état d’essai du plan" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "" @@ -783,7 +791,7 @@ msgstr "Le mot de passe et la confirmation doivent être identiques" msgid "research output not found" msgstr "" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -956,27 +964,27 @@ msgstr "Votre compte a bien été associé à %{scheme}." msgid "Unable to link your account to %{scheme}." msgstr "Il est impossible d’associer votre compte à %{scheme}." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "La mesure %{action} pour %{username} a été effectuée avec succès." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "activé" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "désactivé" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "Il est impossible de %{action} %{username}" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "activer" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "désactiver" @@ -1270,54 +1278,54 @@ msgstr "Les 9 derniers mois" msgid "Last 12 months" msgstr "Les 12 derniers mois" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "Requête ou commentaire associé à %{tool_name}" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Bienvenue à %{tool_name}" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "Un plan de gestion des données dans %{tool_name} a été partagé avec vous" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "" "Les autorisations pour un plan de gestion des données dans %{tool_name} sont m" "odifiées" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "Autorisations relatives à PGD retirées dans %{tool_name}" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "" "%{tool_name}: Les commentaires d’un spécialiste ont été fournis pour %{plan_ti" "tle}" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "Visibilité du PGD modifiée : %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: un nouveau commentaire a été ajouté à %{plan_title}" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Privilèges d’administrateur accordés dans %{tool_name}" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "Modifications de l'API pour %{tool_name}" @@ -1553,15 +1561,15 @@ msgstr "" msgid "already assigned a value" msgstr "une valeur a déjà été attribuée" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Courriel de rétroaction" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "doit être dans l’un des formats suivants: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "ne peut pas dépasser 500 Ko" @@ -1691,7 +1699,7 @@ msgstr "" msgid "Conditions in the template refer backwards" msgstr "Les conditions du modèle sont associées à une référence antérieure" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "" "Un plan de gestion des données dans %{application_name} a été partagé avec vou" @@ -2122,7 +2130,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4652,7 +4660,7 @@ msgstr "" msgid "Instructions" msgstr "Consignes" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Format" @@ -4660,71 +4668,71 @@ msgstr "Format" msgid "Download settings" msgstr "Télécharger les paramètres" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Sélectionner la phase à télécharger" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "Composants de plan facultatifs" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "page de couverture des détails du projet" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "texte des questions et en-têtes des sections" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "questions sans réponse" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "sections supplémentaires non demandées par l’organisme de financement" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Sélectionner la phase à télécharger" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "Format PDF" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Police de caractère" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Marge (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Police de caractère" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Taille" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Haut" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Bas" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Gauche" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Droite" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/fr_FR/LC_MESSAGES/app.mo b/config/locale/fr_FR/LC_MESSAGES/app.mo index 281700601f..17404fb0ed 100644 Binary files a/config/locale/fr_FR/LC_MESSAGES/app.mo and b/config/locale/fr_FR/LC_MESSAGES/app.mo differ diff --git a/config/locale/fr_FR/app.po b/config/locale/fr_FR/app.po index 739c9150b6..a212b381ce 100644 --- a/config/locale/fr_FR/app.po +++ b/config/locale/fr_FR/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -130,87 +130,95 @@ msgstr "JSON non valide" msgid "No Plans found" msgstr "Aucun plan trouvé" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Vous n'êtes pas autorisé à effectuer cette opération." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Vous devez vous connecter ou vous enregistrer afin de continuer." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "Impossible de %{action} le %{object}. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "%{object} %{action} avec succès." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "Client API" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "plan" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "Groupe de recommandations" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "Commentaire" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organisme" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "autorisation" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "préférences" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "profil" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "utilisateur" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "option de question" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Enregistrement non trouvé" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "scope doit être un objet de type ActiveRecord::Relation" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params doit être un objet de type Hash" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params doit être un objet de type Hash" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "locals doit être un objet de type Hash" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Accès restreint à Voir tous les enregistrements" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Trier par %{sort_field}" @@ -251,77 +259,77 @@ msgstr "Mail de contact envoyé avec succès." msgid "Unable to submit your request" msgstr "Impossible de soumettre votre demande" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "ajouter" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "ajouté" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "enregistré" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "enregistrer" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "supprimé(e)" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "supprimer" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "Plan non trouvé" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "contributeur non trouvé" @@ -335,7 +343,7 @@ msgstr "Une erreur s'est produite lors de la demande de commentaires sur ce plan #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -351,7 +359,7 @@ msgstr "créé" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -394,7 +402,7 @@ msgstr "dépublier" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -408,7 +416,7 @@ msgstr "supprimé" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -453,19 +461,19 @@ msgstr "Impossible de créer une nouvelle version de ce modèle.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "mis à jour" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -559,7 +567,7 @@ msgid "Unable to delete this version of the template." msgstr "Impossible de supprimer cette version du modèle." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "copier" @@ -568,11 +576,11 @@ msgstr "copier" msgid "That template is no longer customizable." msgstr "Ce template n'est plus personnalisable." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Impossible de personnaliser ce modèle." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Ce modèle n'est pas personnalisable." @@ -662,11 +670,11 @@ msgstr "Ce plan est basé sur le" msgid "template with customisations by the" msgstr "modèle personnalisé par" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "copié" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -674,23 +682,23 @@ msgstr "" "Impossible de changer le statut du plan, au moins %{percentage} % de questions" " répondues sont nécessaires" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "Impossible de trouver le plan avec l'identifiant %{plan_id}" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Votre projet est maintenant un test." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Votre projet n'est plus un test." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Impossible de changer le statut du plan" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "Il n'y a pas de forfait associé à l'identifiant %{ s" @@ -788,7 +796,7 @@ msgstr "Le mot de passe et sa confirmation doivent correspondre" msgid "research output not found" msgstr "produit de recherche introuvable" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -967,27 +975,27 @@ msgstr "Votre compte a été lié à %{scheme} avec succès." msgid "Unable to link your account to %{scheme}." msgstr "Impossible de lier votre compte avec %{scheme}." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "Compte de %{username} %{action} avec succès." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "activé" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "désactivé" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "Impossible de %{action} %{username}" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "activer" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "désactiver" @@ -1280,50 +1288,50 @@ msgstr "9 derniers mois" msgid "Last 12 months" msgstr "12 derniers mois" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "Requête ou suggestion liée à %{tool_name}" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Bienvenue sur %{tool_name}" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "Un plan de gestion de données a été partagé avec vous sur %{tool_name}" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "Modification des autorisations sur un plan de %{tool_name}" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "Autorisations retirées d'un plan de %{tool_name}" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name} a demandé une assistance conseil pour un plan %{tool_name}" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name} : Une assistance conseil a été fournie pour %{plan_title}" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "Changement de visibilité d'un plan : %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: Un nouveau commentaire a été ajouté à %{plan_title}" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Droits administrateur attribués dans %{tool_name}" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "Modifications de l'API %{tool_name}" @@ -1564,15 +1572,15 @@ msgstr "" msgid "already assigned a value" msgstr "a déjà une valeur attribuée" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Message du mail de l'assistance conseil" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "doit être dans l'un des formats suivants : jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "ne peut peser plus de 500ko" @@ -1700,7 +1708,7 @@ msgstr "" "Les conditions du modèle s'appliquent à une question positionnée avant celle-c" "i" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "Un plan de gestion de données a été partagé avec vous sur %{application_name}" @@ -2128,7 +2136,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4654,7 +4662,7 @@ msgstr "Commentaires & Recommandations" msgid "Instructions" msgstr "Instructions" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Format" @@ -4662,71 +4670,71 @@ msgstr "Format" msgid "Download settings" msgstr "Paramètres de téléchargement" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Sélectionner la phase à télécharger" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "Eléments optionnels du plan" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "page de renseignements sur le projet" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "texte de la question et entête de la section" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "questions non répondues" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "produits de recherche" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "section(s) supplémentaire(s) non requise(s) par l'organisme financeur" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Sélectionner la phase à télécharger" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "Mise en forme du PDF" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Police de caractères" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Marge (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Police" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Taille" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Haut" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Bas" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Gauche" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Droite" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/pt_BR/LC_MESSAGES/app.mo b/config/locale/pt_BR/LC_MESSAGES/app.mo index 48f01f060c..6695cbe96a 100644 Binary files a/config/locale/pt_BR/LC_MESSAGES/app.mo and b/config/locale/pt_BR/LC_MESSAGES/app.mo differ diff --git a/config/locale/pt_BR/app.po b/config/locale/pt_BR/app.po index 44e4aeb102..a401ad5aad 100644 --- a/config/locale/pt_BR/app.po +++ b/config/locale/pt_BR/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Portuguese\n" "Language: pt_BR\n" @@ -127,87 +127,95 @@ msgstr "JSON inválido" msgid "No Plans found" msgstr "Nenhum plano encontrado" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Você não tem permissão para realizar essa ação." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Você precisa entrar ou registrar-se antes de continuar." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "Não é possível %{action} o %{object}. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "Com sucesso %{action} o %{object}." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "Cliente da API" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "plano" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "grupo de instruções" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "commentário" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organização" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "permissão" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "preferências" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "perfil" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "usuário" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "opção de pergunta" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Registro não encontrado" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "escopo deve ser um objeto ActiveRecord::Relation" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params deve ser um objeto hash" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params deve ser um objeto hash" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "locals deve ser um objeto Hash" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Acesso restrito para visualizar todos os registros" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Classificar por %{sort_field}" @@ -248,77 +256,77 @@ msgstr "Email de contato foi enviado com sucesso." msgid "Unable to submit your request" msgstr "Não é possível enviar sua solicitação" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "Adicionar" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "adicionado" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "salvo" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "Salvar" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "removido" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "Remover" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "plano não encontrado" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "colaborador não encontrado" @@ -332,7 +340,7 @@ msgstr "Ocorreu um erro ao solicitar feedback para este plano." #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -348,7 +356,7 @@ msgstr "criado" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -391,7 +399,7 @@ msgstr "cancelar publicação" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -405,7 +413,7 @@ msgstr "apagado" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -450,19 +458,19 @@ msgstr "Não foi possível criar uma nova versão deste modelo.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "Atualizado" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -552,7 +560,7 @@ msgid "Unable to delete this version of the template." msgstr "Não foi possível excluir esta versão do modelo." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "cópia" @@ -561,11 +569,11 @@ msgstr "cópia" msgid "That template is no longer customizable." msgstr "Esse modelo não é mais customizáveis." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Não customização esse modelo." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Esse modelo não é customizáveis." @@ -655,11 +663,11 @@ msgstr "Este plano é baseado no" msgid "template with customisations by the" msgstr "modelo com personalizações pelo" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "copieado" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -667,23 +675,23 @@ msgstr "" "Não conseguimos mudar o status do plano. É preciso pelo menos %{percentage} de" " respostas." -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "Não conseguimos encontrar o plano com id %{plan_id}" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Seu projeto agora é um teste." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Seu projeto não é mais um teste." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Não conseguimos mudar o status de teste do plano" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "Não há plano associado ao id %{ s" @@ -779,7 +787,7 @@ msgstr "A senha e a confirmação devem ser iguais" msgid "research output not found" msgstr "resultado da pesquisa não encontrado" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -956,27 +964,27 @@ msgstr "Sua conta foi vinculada a %{scheme}." msgid "Unable to link your account to %{scheme}." msgstr "Não é possível vincular sua conta a% {scheme}." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "Successo ao %{action} conta do %{username}" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "ativado" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "desativado" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "Incapaz de %{action} %{username}" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "Ativo" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "desativar" @@ -1268,50 +1276,50 @@ msgstr "Últimos 9 meses" msgid "Last 12 months" msgstr "Últimos 12 meses" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "Pergunta ou feedback relacionado a %{tool_name}" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Bem-vindo a %{tool_name}" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "Um plano de gerenciamento de dados em %{tool_name} foi compartilhado com você" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "Permissões modificadas em um Plano de Gestão de Dados em %{tool_name}" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "Permissões removidas em um PGD em %{tool_name}" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name} solicitou feedback sobre um plano %{tool_name}" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name}: O feedback de especialistas foi fornecido para %{plan_title}" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "Visibilidade do PGD Modificada: %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: Um novo comentário foi adicionado a %{plan_title}" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Privilégios de administrador atribuídos em %{tool_name}" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "Alterações na API %{tool_name}" @@ -1551,15 +1559,15 @@ msgstr "" msgid "already assigned a value" msgstr "já atribuiu um valor" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Mensagem de email de feedback" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "deve ser um dos seguintes formatos: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "não pode ser maior que 500KB" @@ -1685,7 +1693,7 @@ msgstr "Você não pode publicar um modelo sem perguntas em uma seção." msgid "Conditions in the template refer backwards" msgstr "As condições no modelo se referem ao contrário" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "Um Plano de Gestão de Dados em %{application_name} foi compartilhado com você" @@ -2112,7 +2120,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4621,7 +4629,7 @@ msgstr "Comentários e orientações" msgid "Instructions" msgstr "Instruções" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Formato" @@ -4629,71 +4637,71 @@ msgstr "Formato" msgid "Download settings" msgstr "Baixar parâmetros" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Selecione a fase a ser baixada" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "Componentes opcionais do plano" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "capa com detalhes do projeto" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "texto das questões e cabeçalhos das seções" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "questões não respondida" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "resultados de pesquisa" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "seção(ões) suplementar(es) não solicitada(s) pela organização financiadora" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Selecione a fase a ser baixada" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "Formatação de PDF" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Fonte" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Margem (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Face" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Tamanho" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Alto" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Fim da página" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Esquerda" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Direito" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/sv_FI/LC_MESSAGES/app.mo b/config/locale/sv_FI/LC_MESSAGES/app.mo index 87905cb49b..90d0abe8ae 100644 Binary files a/config/locale/sv_FI/LC_MESSAGES/app.mo and b/config/locale/sv_FI/LC_MESSAGES/app.mo differ diff --git a/config/locale/sv_FI/app.po b/config/locale/sv_FI/app.po index 93e28ad899..c464b0683b 100644 --- a/config/locale/sv_FI/app.po +++ b/config/locale/sv_FI/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Swedish\n" "Language: sv_FI\n" @@ -127,87 +127,95 @@ msgstr "Ogiltig JSON" msgid "No Plans found" msgstr "Inga planer hittades" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Du har inte behörighet att utföra denna åtgärd." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Du behöver logga in eller registrera dig innan du kan fortsätta." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "Det går inte att %{action} %{object}. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "Framgångsrikt %{action} %{object}." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "API-klient" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "planen" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "Guidningsgrupp" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "Kommentar" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "organisation" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "lov" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "preferenser" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "profil" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "användare" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "fråga alternativ" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Posten hittades inte" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "Räckvidd bör vara ett ActiveRecord :: Relation-objekt" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params ska vara ett Hash-objekt" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params ska vara ett Hash-objekt" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "lokalbefolkningen borde vara ett Hash-objekt" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Begränsad åtkomst till Visa alla poster" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "Sortera efter %{sort_field}" @@ -248,77 +256,77 @@ msgstr "Kontaktadressen skickades med framgång." msgid "Unable to submit your request" msgstr "Det gick inte att skicka din förfrågan" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "Lägg till" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "Lagt till" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "sparade" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "spara" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "tog bort" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "ta bort" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "Planen hittades inte" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "bidragsgivare hittades inte" @@ -332,7 +340,7 @@ msgstr "Ett fel uppstod när du begärde feedback för den här planen." #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -348,7 +356,7 @@ msgstr "skapad" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -389,7 +397,7 @@ msgstr "Avpublicera" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -403,7 +411,7 @@ msgstr "raderade" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -448,19 +456,19 @@ msgstr "Det gick inte att skapa en ny version av den här mallen.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "Uppdaterad" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -550,7 +558,7 @@ msgid "Unable to delete this version of the template." msgstr "Det gick inte att ta bort den här versionen av mallen." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "kopia" @@ -559,11 +567,11 @@ msgstr "kopia" msgid "That template is no longer customizable." msgstr "Den mallen är inte längre anpassningsbar." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Det gick inte att anpassa den mallen." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Den mallen är inte anpassningsbar." @@ -653,11 +661,11 @@ msgstr "Denna plan är baserad på" msgid "template with customisations by the" msgstr "mall med anpassningar av" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "kopieras" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -665,23 +673,23 @@ msgstr "" "Det går inte att ändra planens status eftersom det behövs minst %{percentage} " "procent svarat" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "Det gick inte att hitta plan id %{plan_id}" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Ditt projekt är nu ett test." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Ditt projekt är inte längre ett test." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Kan inte ändra planens teststatus" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "Det finns ingen plan kopplad till id %{ s" @@ -775,7 +783,7 @@ msgstr "Lösenord och bekräftelse måste matcha" msgid "research output not found" msgstr "forskningsresultat hittades inte" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -948,27 +956,27 @@ msgstr "Ditt konto har länkats till %{scheme}." msgid "Unable to link your account to %{scheme}." msgstr "Det gick inte att länka ditt konto till %{scheme}." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "Framgångsrikt %{action} %{username} s konto." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "aktiverad" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "deaktiveras" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr "Kan inte %{action} %{username}" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "Aktivera" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "avaktivera" @@ -1259,50 +1267,50 @@ msgstr "Senaste 9 månaderna" msgid "Last 12 months" msgstr "Senaste 12 månaderna" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "Fråga eller feedback relaterad till %{tool_name}" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "Välkommen till %{tool_name}" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "En datahanteringsplan i %{tool_name} har delats med dig" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "Ändrade behörigheter på en datahanteringsplan i %{tool_name}" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "Behörigheter tas bort på en DMP i %{tool_name}" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name} har begärt feedback på en %{tool_name} plan" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name}: Feedback från experter har lämnats för %{plan_title}" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "DMP-synlighet ändrad: %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: En ny kommentar läggs till i %{plan_title}" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "Administratörsbehörighet beviljas i %{tool_name}" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "%{tool_name} API-ändringar" @@ -1542,15 +1550,15 @@ msgstr "" msgid "already assigned a value" msgstr "redan tilldelat ett värde" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Feedback e-postmeddelande" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "måste vara ett av följande format: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "kan inte vara större än 500 kB" @@ -1674,7 +1682,7 @@ msgstr "Du kan inte publicera en mall utan frågor i en sektion." msgid "Conditions in the template refer backwards" msgstr "Förhållandena i mallen hänvisar bakåt" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "En datahanteringsplan i %{application_name} har delats med dig" @@ -2101,7 +2109,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4595,7 +4603,7 @@ msgstr "Kommentarer & vägledning" msgid "Instructions" msgstr "Instruktioner" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Formatera" @@ -4603,71 +4611,71 @@ msgstr "Formatera" msgid "Download settings" msgstr "Hämta inställningar" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "Välj fas att hämta" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "Valfria plankomponenter" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "projekt detaljer täckplåt" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "Frågeformulär och rubrikrubriker" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "obesvarade frågor" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "forskningsresultat" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "kompletterande sektion (er) som inte begärs av finansieringsorganisationen" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "Välj fas att hämta" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "PDF-formatering" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Font" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Marginal (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Ansikte" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Storlek" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Topp" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Botten" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Vänster" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Höger" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locale/tr_TR/LC_MESSAGES/app.mo b/config/locale/tr_TR/LC_MESSAGES/app.mo index 771cc90b3d..147db98432 100644 Binary files a/config/locale/tr_TR/LC_MESSAGES/app.mo and b/config/locale/tr_TR/LC_MESSAGES/app.mo differ diff --git a/config/locale/tr_TR/app.po b/config/locale/tr_TR/app.po index 184aef913c..439e806db9 100644 --- a/config/locale/tr_TR/app.po +++ b/config/locale/tr_TR/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: roadmap_upstream 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-04-10 13:28-0600\n" -"PO-Revision-Date: 2025-04-10 21:28+0200\n" +"POT-Creation-Date: 2025-12-23 08:33-0700\n" +"PO-Revision-Date: 2025-12-23 15:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -125,87 +125,95 @@ msgstr "Geçersiz JSON" msgid "No Plans found" msgstr "Hiç Plan bulunamadı" -#: ../../app/controllers/application_controller.rb:36 +#: ../../app/controllers/api/v2/base_api_controller.rb:72 +msgid "There was a problem in the server." +msgstr "" + +#: ../../app/controllers/api/v2/base_api_controller.rb:78 +msgid "The client is not authorized to perform this action." +msgstr "" + +#: ../../app/controllers/application_controller.rb:37 msgid "You are not authorized to perform this action." msgstr "Bu eylemi gerçekleştirme yetkiniz yok." -#: ../../app/controllers/application_controller.rb:40 +#: ../../app/controllers/application_controller.rb:41 msgid "You need to sign in or sign up before continuing." msgstr "Devam etmeden önce oturum açmanız veya kaydolmanız gerekir." -#: ../../app/controllers/application_controller.rb:108 +#: ../../app/controllers/application_controller.rb:115 msgid "Unable to %{action} the %{object}. %{errors}" msgstr "%{action} %{object} yapılamıyor. %{errors}" -#: ../../app/controllers/application_controller.rb:114 +#: ../../app/controllers/application_controller.rb:121 msgid "Successfully %{action} the %{object}." msgstr "%{object} başarıyla %{action}." -#: ../../app/controllers/application_controller.rb:127 +#: ../../app/controllers/application_controller.rb:134 msgid "API client" msgstr "API istemcisi" -#: ../../app/controllers/application_controller.rb:128 +#: ../../app/controllers/application_controller.rb:135 msgid "plan" msgstr "plan" -#: ../../app/controllers/application_controller.rb:129 +#: ../../app/controllers/application_controller.rb:136 msgid "guidance group" msgstr "rehberlik grubu" -#: ../../app/controllers/application_controller.rb:130 +#: ../../app/controllers/application_controller.rb:137 msgid "comment" msgstr "yorum yap" -#: ../../app/controllers/application_controller.rb:131 +#: ../../app/controllers/application_controller.rb:138 msgid "organisation" msgstr "kuruluş" -#: ../../app/controllers/application_controller.rb:132 +#: ../../app/controllers/application_controller.rb:139 msgid "permission" msgstr "izin" -#: ../../app/controllers/application_controller.rb:133 +#: ../../app/controllers/application_controller.rb:140 msgid "preferences" msgstr "tercihler" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "profile" msgstr "profil" -#: ../../app/controllers/application_controller.rb:134 +#: ../../app/controllers/application_controller.rb:141 msgid "user" msgstr "kullanıcı" -#: ../../app/controllers/application_controller.rb:135 +#: ../../app/controllers/application_controller.rb:142 msgid "question option" msgstr "soru seçeneği" -#: ../../app/controllers/application_controller.rb:181 +#: ../../app/controllers/application_controller.rb:188 msgid "Record Not Found" msgstr "Kayıt bulunamadı" -#: ../../app/controllers/concerns/paginable.rb:45 +#: ../../app/controllers/concerns/paginable.rb:46 msgid "scope should be an ActiveRecord::Relation object" msgstr "kapsam bir ActiveRecord::Relation nesnesi olmalıdır" -#: ../../app/controllers/concerns/paginable.rb:47 +#: ../../app/controllers/concerns/paginable.rb:48 msgid "path_params should be a Hash object" msgstr "path_params bir Hash nesnesi olmalıdır" -#: ../../app/controllers/concerns/paginable.rb:48 +#: ../../app/controllers/concerns/paginable.rb:49 msgid "query_params should be a Hash object" msgstr "query_params bir Hash nesnesi olmalıdır" -#: ../../app/controllers/concerns/paginable.rb:49 +#: ../../app/controllers/concerns/paginable.rb:50 msgid "locals should be a Hash object" msgstr "locals bir Hash nesnesi olmalıdır" -#: ../../app/controllers/concerns/paginable.rb:70 +#: ../../app/controllers/concerns/paginable.rb:71 msgid "Restricted access to View All the records" msgstr "Tüm kayıtları görüntülemek için kısıtlı erişim" -#: ../../app/controllers/concerns/paginable.rb:183 +#: ../../app/controllers/concerns/paginable.rb:184 msgid "Sort by %{sort_field}" msgstr "%{sort_field} alanına göre sırala" @@ -246,77 +254,77 @@ msgstr "İletişim e-postası başarıyla gönderildi." msgid "Unable to submit your request" msgstr "İsteğiniz gönderilemedi" -#: ../../app/controllers/contributors_controller.rb:40 -#: ../../app/controllers/contributors_controller.rb:56 +#: ../../app/controllers/contributors_controller.rb:41 +#: ../../app/controllers/contributors_controller.rb:57 #: ../../app/controllers/research_outputs_controller.rb:42 msgid "add" msgstr "ekle" -#: ../../app/controllers/contributors_controller.rb:54 +#: ../../app/controllers/contributors_controller.rb:55 #: ../../app/controllers/research_outputs_controller.rb:40 msgid "added" msgstr "eklendi" -#: ../../app/controllers/contributors_controller.rb:72 +#: ../../app/controllers/contributors_controller.rb:73 #: ../../app/controllers/guidance_groups_controller.rb:55 #: ../../app/controllers/guidances_controller.rb:75 -#: ../../app/controllers/notes_controller.rb:88 +#: ../../app/controllers/notes_controller.rb:89 #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:103 #: ../../app/controllers/org_admin/templates_controller.rb:210 #: ../../app/controllers/orgs_controller.rb:92 -#: ../../app/controllers/plans_controller.rb:280 -#: ../../app/controllers/plans_controller.rb:283 +#: ../../app/controllers/plans_controller.rb:281 +#: ../../app/controllers/plans_controller.rb:284 #: ../../app/controllers/registrations_controller.rb:249 #: ../../app/controllers/registrations_controller.rb:253 #: ../../app/controllers/registrations_controller.rb:280 #: ../../app/controllers/registrations_controller.rb:284 #: ../../app/controllers/research_outputs_controller.rb:60 -#: ../../app/controllers/users_controller.rb:103 -#: ../../app/controllers/users_controller.rb:131 +#: ../../app/controllers/users_controller.rb:104 +#: ../../app/controllers/users_controller.rb:132 msgid "saved" msgstr "kaydedildi" -#: ../../app/controllers/contributors_controller.rb:74 +#: ../../app/controllers/contributors_controller.rb:75 #: ../../app/controllers/guidance_groups_controller.rb:57 #: ../../app/controllers/guidances_controller.rb:77 -#: ../../app/controllers/notes_controller.rb:106 +#: ../../app/controllers/notes_controller.rb:107 #: ../../app/controllers/org_admin/departments_controller.rb:52 #: ../../app/controllers/org_admin/sections_controller.rb:105 #: ../../app/controllers/org_admin/templates_controller.rb:215 #: ../../app/controllers/orgs_controller.rb:94 -#: ../../app/controllers/plans_controller.rb:289 -#: ../../app/controllers/plans_controller.rb:292 -#: ../../app/controllers/plans_controller.rb:296 -#: ../../app/controllers/plans_controller.rb:299 +#: ../../app/controllers/plans_controller.rb:290 +#: ../../app/controllers/plans_controller.rb:293 +#: ../../app/controllers/plans_controller.rb:297 +#: ../../app/controllers/plans_controller.rb:300 #: ../../app/controllers/registrations_controller.rb:256 #: ../../app/controllers/registrations_controller.rb:287 #: ../../app/controllers/research_outputs_controller.rb:63 msgid "save" msgstr "kaydet" -#: ../../app/controllers/contributors_controller.rb:83 -#: ../../app/controllers/notes_controller.rb:130 +#: ../../app/controllers/contributors_controller.rb:84 +#: ../../app/controllers/notes_controller.rb:131 #: ../../app/controllers/org_admin/templates_controller.rb:243 #: ../../app/controllers/research_outputs_controller.rb:74 #: ../../app/controllers/super_admin/orgs_controller.rb:94 msgid "removed" msgstr "kaldırıldı" -#: ../../app/controllers/contributors_controller.rb:86 -#: ../../app/controllers/notes_controller.rb:148 +#: ../../app/controllers/contributors_controller.rb:87 +#: ../../app/controllers/notes_controller.rb:149 #: ../../app/controllers/org_admin/templates_controller.rb:245 #: ../../app/controllers/research_outputs_controller.rb:77 #: ../../app/controllers/super_admin/orgs_controller.rb:97 msgid "remove" msgstr "kaldır" -#: ../../app/controllers/contributors_controller.rb:160 +#: ../../app/controllers/contributors_controller.rb:161 #: ../../app/controllers/research_outputs_controller.rb:208 msgid "plan not found" msgstr "plan bulunamadı" -#: ../../app/controllers/contributors_controller.rb:168 +#: ../../app/controllers/contributors_controller.rb:169 msgid "contributor not found" msgstr "katkı sağlayan kişi bulunamadı" @@ -330,7 +338,7 @@ msgstr "Bu plan için geri bildirim istenirken bir hata oluştu." #: ../../app/controllers/guidance_groups_controller.rb:31 #: ../../app/controllers/guidances_controller.rb:53 -#: ../../app/controllers/notes_controller.rb:47 +#: ../../app/controllers/notes_controller.rb:48 #: ../../app/controllers/org_admin/departments_controller.rb:26 #: ../../app/controllers/org_admin/phases_controller.rb:121 #: ../../app/controllers/org_admin/questions_controller.rb:94 @@ -346,7 +354,7 @@ msgstr "oluşturuldu" #: ../../app/controllers/guidance_groups_controller.rb:34 #: ../../app/controllers/guidances_controller.rb:55 -#: ../../app/controllers/notes_controller.rb:66 +#: ../../app/controllers/notes_controller.rb:67 #: ../../app/controllers/org_admin/departments_controller.rb:30 #: ../../app/controllers/org_admin/phases_controller.rb:123 #: ../../app/controllers/org_admin/questions_controller.rb:96 @@ -385,7 +393,7 @@ msgstr "yayından kaldır" #: ../../app/controllers/org_admin/question_options_controller.rb:24 #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:128 -#: ../../app/controllers/plans_controller.rb:342 +#: ../../app/controllers/plans_controller.rb:343 #: ../../app/controllers/super_admin/api_clients_controller.rb:81 #: ../../app/controllers/super_admin/notifications_controller.rb:85 #: ../../app/controllers/super_admin/themes_controller.rb:51 @@ -399,7 +407,7 @@ msgstr "silindi" #: ../../app/controllers/org_admin/question_options_controller.rb:26 #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:130 -#: ../../app/controllers/plans_controller.rb:347 +#: ../../app/controllers/plans_controller.rb:348 #: ../../app/controllers/super_admin/api_clients_controller.rb:84 #: ../../app/controllers/super_admin/notifications_controller.rb:88 #: ../../app/controllers/super_admin/themes_controller.rb:54 @@ -442,19 +450,19 @@ msgstr "Bu şablonun yeni bir sürümü oluşturulamıyor.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 -#: ../../app/controllers/plans_controller.rb:416 +#: ../../app/controllers/plans_controller.rb:417 #: ../../app/controllers/super_admin/api_clients_controller.rb:68 #: ../../app/controllers/super_admin/notifications_controller.rb:52 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:54 -#: ../../app/controllers/users_controller.rb:108 +#: ../../app/controllers/users_controller.rb:109 msgid "updated" msgstr "güncellendi" #: ../../app/controllers/org_admin/phases_controller.rb:149 #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 -#: ../../app/controllers/plans_controller.rb:419 +#: ../../app/controllers/plans_controller.rb:420 #: ../../app/controllers/super_admin/api_clients_controller.rb:70 #: ../../app/controllers/super_admin/notifications_controller.rb:55 #: ../../app/controllers/super_admin/themes_controller.rb:41 @@ -544,7 +552,7 @@ msgid "Unable to delete this version of the template." msgstr "Şablonun bu sürümü silinemiyor." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 -#: ../../app/controllers/plans_controller.rb:395 +#: ../../app/controllers/plans_controller.rb:396 msgid "copy" msgstr "kopyala" @@ -553,11 +561,11 @@ msgstr "kopyala" msgid "That template is no longer customizable." msgstr "Bu şablon artık özelleştirilemez." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:21 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:22 msgid "Unable to customize that template." msgstr "Bu şablon özelleştirilemiyor." -#: ../../app/controllers/org_admin/template_customizations_controller.rb:24 +#: ../../app/controllers/org_admin/template_customizations_controller.rb:25 msgid "That template is not customizable." msgstr "Bu şablon özelleştirilemez." @@ -649,11 +657,11 @@ msgstr "Bu plan şunlara dayanmaktadır:" msgid "template with customisations by the" msgstr "şu kişi tarafından özelleştirmeler içeren şablon:" -#: ../../app/controllers/plans_controller.rb:393 +#: ../../app/controllers/plans_controller.rb:394 msgid "copied" msgstr "kopyalandı" -#: ../../app/controllers/plans_controller.rb:424 +#: ../../app/controllers/plans_controller.rb:425 msgid "" "Unable to change the plan's status since it is needed at least %{percentage} p" "ercentage responded" @@ -661,23 +669,23 @@ msgstr "" "En az yüzde %{percentage} yanıt verilmesi gerektiğinden planın durumu değiştir" "ilemiyor" -#: ../../app/controllers/plans_controller.rb:430 +#: ../../app/controllers/plans_controller.rb:431 msgid "Unable to find plan id %{plan_id}" msgstr "%{plan_id} no.'lu plan bulunamadı" -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is now a test." msgstr "Projeniz şu an bir test." -#: ../../app/controllers/plans_controller.rb:445 +#: ../../app/controllers/plans_controller.rb:446 msgid "Your project is no longer a test." msgstr "Projeniz artık bir test değil." -#: ../../app/controllers/plans_controller.rb:449 +#: ../../app/controllers/plans_controller.rb:450 msgid "Unable to change the plan's test status" msgstr "Planın test durumu değiştirilemiyor" -#: ../../app/controllers/plans_controller.rb:462 +#: ../../app/controllers/plans_controller.rb:463 msgid "There is no plan associated with id %{s" msgstr "%{ kimliğiyle ilişkilendirilmiş bir plan yok s" @@ -770,7 +778,7 @@ msgstr "Şifre ve onay eşleşmelidir" msgid "research output not found" msgstr "araştırma çıktısı bulunamadı" -#: ../../app/controllers/roles_controller.rb:26 +#: ../../app/controllers/roles_controller.rb:27 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." @@ -943,27 +951,27 @@ msgstr "Hesabınız başarıyla %{scheme} şemasına bağlandı." msgid "Unable to link your account to %{scheme}." msgstr "Hesabınız %{scheme} şemasına bağlanamadı." -#: ../../app/controllers/users_controller.rb:149 +#: ../../app/controllers/users_controller.rb:150 msgid "Successfully %{action} %{username}'s account." msgstr "%{username} adlı kullanıcının hesabı başarıyla %{action}." -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "activated" msgstr "etkinleştirildi" -#: ../../app/controllers/users_controller.rb:150 +#: ../../app/controllers/users_controller.rb:151 msgid "deactivated" msgstr "devre dışı bırakıldı" -#: ../../app/controllers/users_controller.rb:156 +#: ../../app/controllers/users_controller.rb:157 msgid "Unable to %{action} %{username}" msgstr " %{username} %{action} yapılamıyor" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "activate" msgstr "etkinleştir" -#: ../../app/controllers/users_controller.rb:157 +#: ../../app/controllers/users_controller.rb:158 msgid "deactivate" msgstr "devre dışı bırak" @@ -1255,50 +1263,50 @@ msgstr "Son 9 ay" msgid "Last 12 months" msgstr "Son 12 ay" -#: ../../app/mailers/user_mailer.rb:17 +#: ../../app/mailers/user_mailer.rb:18 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:5 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5 #: ../../app/views/user_mailer/_email_signature.html.erb:2 msgid "Query or feedback related to %{tool_name}" msgstr "%{tool_name} ile ilgili sorgu veya geri bildirim" -#: ../../app/mailers/user_mailer.rb:25 +#: ../../app/mailers/user_mailer.rb:26 msgid "Welcome to %{tool_name}" msgstr "%{tool_name} aracına hoş geldiniz" -#: ../../app/mailers/user_mailer.rb:62 +#: ../../app/mailers/user_mailer.rb:63 msgid "A Data Management Plan in %{tool_name} has been shared with you" msgstr "%{tool_name} içinde bir Veri Yönetim Planı sizinle paylaşıldı" -#: ../../app/mailers/user_mailer.rb:79 +#: ../../app/mailers/user_mailer.rb:80 msgid "Changed permissions on a Data Management Plan in %{tool_name}" msgstr "%{tool_name} aracındaki bir Veri Yönetim Planına ilişkin değiştirilen izinler" -#: ../../app/mailers/user_mailer.rb:94 +#: ../../app/mailers/user_mailer.rb:95 msgid "Permissions removed on a DMP in %{tool_name}" msgstr "%{tool_name} içindeki bir VYP'de izinler kaldırıldı" -#: ../../app/mailers/user_mailer.rb:112 +#: ../../app/mailers/user_mailer.rb:113 msgid "%{user_name} has requested feedback on a %{tool_name} plan" msgstr "%{user_name}, bir %{tool_name} planı hakkında geri bildirim istedi" -#: ../../app/mailers/user_mailer.rb:135 +#: ../../app/mailers/user_mailer.rb:136 msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}" msgstr "%{tool_name}: %{plan_title} için uzman geri bildirimi sağlandı" -#: ../../app/mailers/user_mailer.rb:153 +#: ../../app/mailers/user_mailer.rb:154 msgid "DMP Visibility Changed: %{plan_title}" msgstr "VYP Görünürlüğü Değiştirildi: %{plan_title}" -#: ../../app/mailers/user_mailer.rb:182 +#: ../../app/mailers/user_mailer.rb:183 msgid "%{tool_name}: A new comment was added to %{plan_title}" msgstr "%{tool_name}: %{plan_title} adlı plana yeni bir yorum eklendi" -#: ../../app/mailers/user_mailer.rb:198 +#: ../../app/mailers/user_mailer.rb:199 msgid "Administrator privileges granted in %{tool_name}" msgstr "%{tool_name} içinde verilen yönetici ayrıcalıkları" -#: ../../app/mailers/user_mailer.rb:216 +#: ../../app/mailers/user_mailer.rb:217 msgid "%{tool_name} API changes" msgstr "%{tool_name} API değişiklikleri" @@ -1534,15 +1542,15 @@ msgstr "" msgid "already assigned a value" msgstr "zaten bir değer atanmış" -#: ../../app/models/org.rb:46 +#: ../../app/models/org.rb:47 msgid "Feedback email message" msgstr "Geri bildirim e-posta iletisi" -#: ../../app/models/org.rb:123 +#: ../../app/models/org.rb:124 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp" msgstr "şu biçimlerden biri olmalıdır: jpeg, jpg, png, gif, bmp" -#: ../../app/models/org.rb:128 +#: ../../app/models/org.rb:129 msgid "can't be larger than 500KB" msgstr "500KB'den büyük olamaz" @@ -1666,7 +1674,7 @@ msgstr "Bir bölümünde soru bulunmayan bir şablonu yayınlayamazsınız." msgid "Conditions in the template refer backwards" msgstr "Şablondaki koşullar geriye dönük" -#: ../../app/models/user.rb:380 +#: ../../app/models/user.rb:386 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "%{application_name} içinde bir Veri Yönetim Planı sizinle paylaşıldı" @@ -2094,7 +2102,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:87 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36 -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -4595,7 +4603,7 @@ msgstr "Yorumlar ve Rehberlik" msgid "Instructions" msgstr "Talimatlar" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:5 msgid "Format" msgstr "Biçim" @@ -4603,71 +4611,71 @@ msgstr "Biçim" msgid "Download settings" msgstr "İndirme ayarları" -#: ../../app/views/plans/_download_form.html.erb:19 -msgid "Select phase to download" -msgstr "İndirilecek aşamayı seçin" - -#: ../../app/views/plans/_download_form.html.erb:26 +#: ../../app/views/plans/_download_form.html.erb:21 msgid "Optional plan components" msgstr "İsteğe bağlı plan bileşenleri" -#: ../../app/views/plans/_download_form.html.erb:30 +#: ../../app/views/plans/_download_form.html.erb:25 msgid "project details coversheet" msgstr "proje detayları kapak sayfası" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:31 msgid "question text and section headings" msgstr "soru metni ve bölüm başlıkları" -#: ../../app/views/plans/_download_form.html.erb:42 +#: ../../app/views/plans/_download_form.html.erb:37 msgid "unanswered questions" msgstr "cevaplanmamış sorular" -#: ../../app/views/plans/_download_form.html.erb:49 +#: ../../app/views/plans/_download_form.html.erb:44 msgid "research outputs" msgstr "araştırma çıktıları" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:52 msgid "supplementary section(s) not requested by funding organisation" msgstr "Fon sağlayıcı kurum tarafından talep edilmeyen ek bölüm(ler)" -#: ../../app/views/plans/_download_form.html.erb:65 +#: ../../app/views/plans/_download_form.html.erb:61 +msgid "Select phase to download" +msgstr "İndirilecek aşamayı seçin" + +#: ../../app/views/plans/_download_form.html.erb:70 msgid "PDF formatting" msgstr "PDF biçimlendirme" -#: ../../app/views/plans/_download_form.html.erb:68 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Font" msgstr "Yazı tipi" -#: ../../app/views/plans/_download_form.html.erb:71 +#: ../../app/views/plans/_download_form.html.erb:76 msgid "Margin (mm)" msgstr "Kenar boşluğu (mm)" -#: ../../app/views/plans/_download_form.html.erb:76 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Face" msgstr "Yüz" -#: ../../app/views/plans/_download_form.html.erb:84 +#: ../../app/views/plans/_download_form.html.erb:89 msgid "Size" msgstr "Boyut" -#: ../../app/views/plans/_download_form.html.erb:92 +#: ../../app/views/plans/_download_form.html.erb:96 msgid "Top" msgstr "Üst" -#: ../../app/views/plans/_download_form.html.erb:101 +#: ../../app/views/plans/_download_form.html.erb:105 msgid "Bottom" msgstr "Alt" -#: ../../app/views/plans/_download_form.html.erb:110 +#: ../../app/views/plans/_download_form.html.erb:114 msgid "Left" msgstr "Kalan" -#: ../../app/views/plans/_download_form.html.erb:119 +#: ../../app/views/plans/_download_form.html.erb:123 msgid "Right" msgstr "Yetki" -#: ../../app/views/plans/_download_form.html.erb:130 +#: ../../app/views/plans/_download_form.html.erb:133 msgid "" "Download Plan (new window)%{open_in_new_window_text}" diff --git a/config/locales/.translation_io b/config/locales/.translation_io index 41850daef0..934fc62ef3 100644 --- a/config/locales/.translation_io +++ b/config/locales/.translation_io @@ -5,4 +5,4 @@ # ignore the conflicts and "sync" again, it will fix this file for you. --- -timestamp: 1744313316 +timestamp: 1766503989 diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml new file mode 100644 index 0000000000..b3c4b2c660 --- /dev/null +++ b/config/locales/doorkeeper.en.yml @@ -0,0 +1,154 @@ +en: + activerecord: + attributes: + doorkeeper/application: + name: 'Name' + redirect_uri: 'Redirect URI' + errors: + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: 'cannot contain a fragment.' + invalid_uri: 'must be a valid URI.' + unspecified_scheme: 'must specify a scheme.' + relative_uri: 'must be an absolute URI.' + secured_uri: 'must be an HTTPS/SSL URI.' + forbidden_uri: 'is forbidden by the server.' + scopes: + not_match_configured: "doesn't match configured on the server." + + doorkeeper: + applications: + confirmations: + destroy: 'Are you sure?' + buttons: + edit: 'Edit' + destroy: 'Destroy' + submit: 'Submit' + cancel: 'Cancel' + authorize: 'Authorize' + form: + error: 'Whoops! Check your form for possible errors' + help: + confidential: 'Application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.' + redirect_uri: 'Use one line per URI' + blank_redirect_uri: "Leave it blank if you configured your provider to use Client Credentials, Resource Owner Password Credentials or any other grant type that doesn't require redirect URI." + scopes: 'Separate scopes with spaces. Leave blank to use the default scopes.' + edit: + title: 'Edit application' + index: + title: 'Your applications' + new: 'New Application' + name: 'Name' + callback_url: 'Callback URL' + confidential: 'Confidential?' + actions: 'Actions' + confidentiality: + 'yes': 'Yes' + 'no': 'No' + new: + title: 'New Application' + show: + title: 'Application: %{name}' + application_id: 'UID' + secret: 'Secret' + secret_hashed: 'Secret hashed' + scopes: 'Scopes' + confidential: 'Confidential' + callback_urls: 'Callback urls' + actions: 'Actions' + not_defined: 'Not defined' + + authorizations: + buttons: + authorize: 'Authorize' + deny: 'Deny' + error: + title: 'An error has occurred' + new: + title: 'Authorization required' + prompt: 'Authorize %{client_name} to use your account?' + able_to: 'This application will be able to' + show: + title: 'Authorization code' + form_post: + title: 'Submit this form' + + authorized_applications: + confirmations: + revoke: 'Are you sure?' + buttons: + revoke: 'Revoke' + index: + title: 'Your authorized applications' + application: 'Application' + created_at: 'Created At' + date_format: '%Y-%m-%d %H:%M:%S' + + pre_authorization: + status: 'Pre-authorization' + + errors: + messages: + # Common error messages + invalid_request: + unknown: 'The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.' + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: 'Request need to be authorized. Required parameter for authorizing request is missing or invalid.' + invalid_redirect_uri: "The requested redirect uri is malformed or doesn't match client redirect URI." + unauthorized_client: 'The client is not authorized to perform this request using this method.' + access_denied: 'The resource owner or authorization server denied the request.' + invalid_scope: 'The requested scope is invalid, unknown, or malformed.' + invalid_code_challenge_method: + zero: 'The authorization server does not support PKCE as there are no accepted code_challenge_method values.' + one: 'The code_challenge_method must be %{challenge_methods}.' + other: 'The code_challenge_method must be one of %{challenge_methods}.' + server_error: 'The authorization server encountered an unexpected condition which prevented it from fulfilling the request.' + temporarily_unavailable: 'The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.' + + # Configuration error messages + credential_flow_not_configured: 'Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.' + resource_owner_authenticator_not_configured: 'Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfigured.' + admin_authenticator_not_configured: 'Access to admin panel is forbidden due to Doorkeeper.configure.admin_authenticator being unconfigured.' + + # Access grant errors + unsupported_response_type: 'The authorization server does not support this response type.' + unsupported_response_mode: 'The authorization server does not support this response mode.' + + # Access token errors + invalid_client: 'Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.' + invalid_grant: 'The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.' + unsupported_grant_type: 'The authorization grant type is not supported by the authorization server.' + + invalid_token: + revoked: "The access token was revoked" + expired: "The access token expired" + unknown: "The access token is invalid" + revoke: + unauthorized: "You are not authorized to revoke this token" + + forbidden_token: + missing_scope: 'Access to this resource requires scope "%{oauth_scopes}".' + + flash: + applications: + create: + notice: 'Application created.' + destroy: + notice: 'Application deleted.' + update: + notice: 'Application updated.' + authorized_applications: + destroy: + notice: 'Application revoked.' + + layouts: + admin: + title: 'Doorkeeper' + nav: + oauth2_provider: 'OAuth2 Provider' + applications: 'Applications' + home: 'Home' + application: + title: 'OAuth authorization required' diff --git a/config/locales/translation.de.yml b/config/locales/translation.de.yml index f0e01bc673..bdf11acbeb 100644 --- a/config/locales/translation.de.yml +++ b/config/locales/translation.de.yml @@ -143,6 +143,23 @@ de: has_one: Datensatz kann nicht gelöscht werden, da ein abhängiger %{record} existiert. has_many: Datensatz kann nicht gelöscht werden, da abhängige %{record} existieren. + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: darf kein Fragment enthalten. + invalid_uri: muss ein valider URI (Identifier) sein. + unspecified_scheme: muss ein Schema angeben. + relative_uri: muss ein absoluter URI (Identifier) sein. + secured_uri: muss ein HTTPS/SSL URI (Identifier) sein. + forbidden_uri: ist vom server verboten. + scopes: + not_match_configured: stimmen nicht mit denen am server hinterlegten + überein. + attributes: + doorkeeper/application: + name: Name + redirect_uri: Redirect URI datetime: distance_in_words: half_a_minute: einer halben Minute @@ -361,3 +378,146 @@ de: Sie es erneut. recaptcha_unreachable: Ups, wir konnten Ihre reCAPTCHA-Antwort nicht validieren. Bitte versuche es erneut. + doorkeeper: + applications: + confirmations: + destroy: Bist du sicher? + buttons: + edit: Bearbeiten + destroy: Löschen + submit: Übertragen + cancel: Abbrechen + authorize: Autorisieren + form: + error: Whoops! Bitte überprüfe das Formular auf Fehler! + help: + confidential: Application will be used where the client secret can be kept + confidential. Native mobile apps and Single Page Apps are considered non-confidential. + redirect_uri: Bitte benutze eine Zeile pro URI + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Bitte die "Scopes" mit Leerzeichen trennen. Bitte frei lassen für + die Verwendung der Default-Werte. + edit: + title: Applikation bearbeiten + index: + title: Deine Applikationen + new: Neue Applikation + name: Name + callback_url: Callback URL + confidential: Vertraulich? + actions: Aktionen + confidentiality: + 'yes': Ja + 'no': Nein + new: + title: Neue Applikation + show: + title: 'Applikation: %{name}' + application_id: Applikations-ID + secret: Secret + secret_hashed: + scopes: Scopes + confidential: Vertraulich + callback_urls: Callback URLs + actions: Aktionen + not_defined: + authorizations: + buttons: + authorize: Autorisieren + deny: Verweigern + error: + title: Ein Fehler ist aufgetreten + new: + title: Autorisierung erforderlich + prompt: Soll %{client_name} für die Benutzung dieses Accounts autorisiert + werden? + able_to: Diese Anwendung wird folgende Rechte haben + show: + title: Autorisierungscode + form_post: + title: + authorized_applications: + confirmations: + revoke: Bist du sicher? + buttons: + revoke: Ungültig machen + index: + title: Deine autorisierten Applikationen + application: Applikation + created_at: erstellt am + date_format: "%Y-%m-%d %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: Die Anfrage enthält einen nicht-unterstützten Parameter, ein Parameter + fehlt oder sie ist anderweitig fehlerhaft. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: Der Redirect-URI in der Anfrage ist ungültig. + unauthorized_client: Der Client ist nicht autorisiert, diese Anfrage mit dieser + Methode auszuführen. + access_denied: Der Resource Owner oder der Autorisierungs-Server hat die Anfrage + verweigert. + invalid_scope: Der angeforderte Scope ist inkorrekt, unbekannt oder fehlerhaft. + invalid_code_challenge_method: + zero: + one: + other: + server_error: Der Autorisierungs-Server hat ein unerwartetes Problem festgestellt + und konnte die Anfrage nicht beenden. + temporarily_unavailable: Der Autorisierungs-Server ist derzeit auf Grund von + temporärer Überlastung oder Wartungsarbeiten am Server nicht in der Lage, + die Anfrage zu bearbeiten . + credential_flow_not_configured: 'Die Prozedur "Resource Owner Password Credentials" + ist fehlgeschlagen: Doorkeeper.configure.resource_owner_from_credentials + ist nicht konfiguriert.' + resource_owner_authenticator_not_configured: 'Die Prozedur "Resource Owner + find" ist fehlgeschlagen: Doorkeeper.configure.resource_owner_authenticator + ist nicht konfiguriert.' + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: Der Autorisierungs-Server unterstützt diesen Antwort-Typ + nicht. + unsupported_response_mode: + invalid_client: 'Client-Autorisierung MKIM ist fehlgeschlagen: Unbekannter + Client, keine Autorisierung mitgeliefert oder Autorisierungsmethode nicht + unterstützt.' + invalid_grant: Die bereitgestellte Autorisierung ist inkorrekt, abgelaufen, + widerrufen, ist mit einem anderen Client verknüpft oder der Redirection + URI stimmt nicht mit der Autorisierungs-Anfrage überein. + unsupported_grant_type: Der Autorisierungs-Typ wird nicht vom Autorisierungs-Server + unterstützt. + invalid_token: + revoked: Der Access Token wurde annuliert + expired: Der Access Token ist abgelaufen + unknown: Der Access Token ist nicht gültig/korrekt + revoke: + unauthorized: Sie sind nicht berechtigt, dieses Token zu widerrufen + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Applikation erstellt. + destroy: + notice: Applikation gelöscht. + update: + notice: Applikation geupdated. + authorized_applications: + destroy: + notice: Applikation widerrufen. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: OAuth2 Provider + applications: Applikationen + home: Home + application: + title: OAuth Autorisierung erforderlich diff --git a/config/locales/translation.en-CA.yml b/config/locales/translation.en-CA.yml index 9e5ed6e7c8..be1ccaed77 100644 --- a/config/locales/translation.en-CA.yml +++ b/config/locales/translation.en-CA.yml @@ -134,6 +134,22 @@ en-CA: restrict_dependent_destroy: has_one: Cannot delete record because a dependent %{record} exists has_many: Cannot delete record because dependent %{record} exist + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: cannot contain a fragment. + invalid_uri: must be a valid URI. + unspecified_scheme: must specify a scheme. + relative_uri: must be an absolute URI. + secured_uri: must be an HTTPS/SSL URI. + forbidden_uri: is forbidden by the server. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Name + redirect_uri: Redirect URI datetime: distance_in_words: half_a_minute: half a minute @@ -230,7 +246,8 @@ en-CA: not_found_in_database: Invalid %{authentication_keys} or password. timeout: Your session expired. Please sign in again to continue. unauthenticated: You need to sign in or sign up before continuing. - unconfirmed: You have to confirm your email address before continuing. + unconfirmed: You need to confirm your account before continuing. (Click to request a new confirmation email) invited: mailer: confirmation_instructions: @@ -340,3 +357,140 @@ en-CA: previous: "‹ Prev" next: Next › truncate: "…" + doorkeeper: + applications: + confirmations: + destroy: Are you sure? + buttons: + edit: Edit + destroy: Destroy + submit: Submit + cancel: Cancel + authorize: Authorize + form: + error: Whoops! Check your form for possible errors + help: + confidential: Application will be used where the client secret can be kept + confidential. Native mobile apps and Single Page Apps are considered non-confidential. + redirect_uri: Use one line per URI + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Separate scopes with spaces. Leave blank to use the default scopes. + edit: + title: Edit application + index: + title: Your applications + new: New Application + name: Name + callback_url: Callback URL + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': 'Yes' + 'no': 'No' + new: + title: New Application + show: + title: 'Application: %{name}' + application_id: Application UID + secret: Secret + secret_hashed: + scopes: Scopes + confidential: Confidential + callback_urls: Callback urls + actions: Actions + not_defined: + authorizations: + buttons: + authorize: Authorize + deny: Deny + error: + title: An error has occurred + new: + title: Authorization required + prompt: Authorize %{client_name} to use your account? + able_to: This application will be able to + show: + title: Authorization code + form_post: + title: + authorized_applications: + confirmations: + revoke: Are you sure? + buttons: + revoke: Revoke + index: + title: Your authorized applications + application: Application + created_at: Created At + date_format: "%Y-%m-%d %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: The request is missing a required parameter, includes an unsupported + parameter value, or is otherwise malformed. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: The requested redirect uri is malformed or doesn't match + client redirect URI. + unauthorized_client: The client is not authorized to perform this request + using this method. + access_denied: The resource owner or authorization server denied the request. + invalid_scope: The requested scope is invalid, unknown, or malformed. + invalid_code_challenge_method: + zero: + one: + other: + server_error: The authorization server encountered an unexpected condition + which prevented it from fulfilling the request. + temporarily_unavailable: The authorization server is currently unable to handle + the request due to a temporary overloading or maintenance of the server. + credential_flow_not_configured: Resource Owner Password Credentials flow failed + due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured. + resource_owner_authenticator_not_configured: Resource Owner find failed due + to Doorkeeper.configure.resource_owner_authenticator being unconfigured. + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: The authorization server does not support this + response type. + unsupported_response_mode: + invalid_client: Client authentication failed due to unknown client, no client + authentication included, or unsupported authentication method. + invalid_grant: The provided authorization grant is invalid, expired, revoked, + does not match the redirection URI used in the authorization request, or + was issued to another client. + unsupported_grant_type: The authorization grant type is not supported by the + authorization server. + invalid_token: + revoked: The access token was revoked + expired: The access token expired + unknown: The access token is invalid + revoke: + unauthorized: You are not authorized to revoke this token + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Application created. + destroy: + notice: Application deleted. + update: + notice: Application updated. + authorized_applications: + destroy: + notice: Application revoked. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: OAuth2 Provider + applications: Applications + home: Home + application: + title: OAuth authorization required diff --git a/config/locales/translation.en-GB.yml b/config/locales/translation.en-GB.yml index 91014ac51c..c5dfbe313f 100644 --- a/config/locales/translation.en-GB.yml +++ b/config/locales/translation.en-GB.yml @@ -134,6 +134,22 @@ en-GB: restrict_dependent_destroy: has_one: Cannot delete record because a dependent %{record} exists has_many: Cannot delete record because dependent %{record} exist + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: cannot contain a fragment. + invalid_uri: must be a valid URI. + unspecified_scheme: must specify a scheme. + relative_uri: must be an absolute URI. + secured_uri: must be an HTTPS/SSL URI. + forbidden_uri: is forbidden by the server. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Name + redirect_uri: Redirect URI datetime: distance_in_words: half_a_minute: half a minute @@ -227,7 +243,8 @@ en-GB: not_found_in_database: Invalid email or password. timeout: Your session expired, please sign in again to continue. unauthenticated: You need to sign in or sign up before continuing. - unconfirmed: You have to confirm your account before continuing. + unconfirmed: You need to confirm your account before continuing. (Click to request a new confirmation email) invited: You have a pending invitation, accept it to finish creating your account. mailer: confirmation_instructions: @@ -341,3 +358,140 @@ en-GB: errors: verification_failed: recaptcha_unreachable: + doorkeeper: + applications: + confirmations: + destroy: Are you sure? + buttons: + edit: Edit + destroy: Destroy + submit: Submit + cancel: Cancel + authorize: Authorize + form: + error: Whoops! Check your form for possible errors + help: + confidential: Application will be used where the client secret can be kept + confidential. Native mobile apps and Single Page Apps are considered non-confidential. + redirect_uri: Use one line per URI + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Separate scopes with spaces. Leave blank to use the default scopes. + edit: + title: Edit application + index: + title: Your applications + new: New Application + name: Name + callback_url: Callback URL + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': 'Yes' + 'no': 'No' + new: + title: New Application + show: + title: 'Application: %{name}' + application_id: Application UID + secret: Secret + secret_hashed: + scopes: Scopes + confidential: Confidential + callback_urls: Callback urls + actions: Actions + not_defined: + authorizations: + buttons: + authorize: Authorize + deny: Deny + error: + title: An error has occurred + new: + title: Authorization required + prompt: Authorize %{client_name} to use your account? + able_to: This application will be able to + show: + title: Authorization code + form_post: + title: + authorized_applications: + confirmations: + revoke: Are you sure? + buttons: + revoke: Revoke + index: + title: Your authorized applications + application: Application + created_at: Created At + date_format: "%Y-%m-%d %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: The request is missing a required parameter, includes an unsupported + parameter value, or is otherwise malformed. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: The requested redirect uri is malformed or doesn't match + client redirect URI. + unauthorized_client: The client is not authorized to perform this request + using this method. + access_denied: The resource owner or authorization server denied the request. + invalid_scope: The requested scope is invalid, unknown, or malformed. + invalid_code_challenge_method: + zero: + one: + other: + server_error: The authorization server encountered an unexpected condition + which prevented it from fulfilling the request. + temporarily_unavailable: The authorization server is currently unable to handle + the request due to a temporary overloading or maintenance of the server. + credential_flow_not_configured: Resource Owner Password Credentials flow failed + due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured. + resource_owner_authenticator_not_configured: Resource Owner find failed due + to Doorkeeper.configure.resource_owner_authenticator being unconfigured. + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: The authorization server does not support this + response type. + unsupported_response_mode: + invalid_client: Client authentication failed due to unknown client, no client + authentication included, or unsupported authentication method. + invalid_grant: The provided authorization grant is invalid, expired, revoked, + does not match the redirection URI used in the authorization request, or + was issued to another client. + unsupported_grant_type: The authorization grant type is not supported by the + authorization server. + invalid_token: + revoked: The access token was revoked + expired: The access token expired + unknown: The access token is invalid + revoke: + unauthorized: You are not authorized to revoke this token + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Application created. + destroy: + notice: Application deleted. + update: + notice: Application updated. + authorized_applications: + destroy: + notice: Application revoked. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: OAuth2 Provider + applications: Applications + home: Home + application: + title: OAuth authorization required diff --git a/config/locales/translation.en-US.yml b/config/locales/translation.en-US.yml index 04f0271b43..7c56f76d0a 100644 --- a/config/locales/translation.en-US.yml +++ b/config/locales/translation.en-US.yml @@ -134,6 +134,22 @@ en-US: restrict_dependent_destroy: has_one: Cannot delete record because a dependent %{record} exists has_many: Cannot delete record because dependent %{record} exist + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: cannot contain a fragment. + invalid_uri: must be a valid URI. + unspecified_scheme: must specify a scheme. + relative_uri: must be an absolute URI. + secured_uri: must be an HTTPS/SSL URI. + forbidden_uri: is forbidden by the server. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Name + redirect_uri: Redirect URI datetime: distance_in_words: half_a_minute: half a minute @@ -343,3 +359,140 @@ en-US: errors: verification_failed: recaptcha_unreachable: + doorkeeper: + applications: + confirmations: + destroy: Are you sure? + buttons: + edit: Edit + destroy: Destroy + submit: Submit + cancel: Cancel + authorize: Authorize + form: + error: Whoops! Check your form for possible errors + help: + confidential: Application will be used where the client secret can be kept + confidential. Native mobile apps and Single Page Apps are considered non-confidential. + redirect_uri: Use one line per URI + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Separate scopes with spaces. Leave blank to use the default scopes. + edit: + title: Edit application + index: + title: Your applications + new: New Application + name: Name + callback_url: Callback URL + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': 'Yes' + 'no': 'No' + new: + title: New Application + show: + title: 'Application: %{name}' + application_id: Application UID + secret: Secret + secret_hashed: + scopes: Scopes + confidential: Confidential + callback_urls: Callback urls + actions: Actions + not_defined: + authorizations: + buttons: + authorize: Authorize + deny: Deny + error: + title: An error has occurred + new: + title: Authorization required + prompt: Authorize %{client_name} to use your account? + able_to: This application will be able to + show: + title: Authorization code + form_post: + title: + authorized_applications: + confirmations: + revoke: Are you sure? + buttons: + revoke: Revoke + index: + title: Your authorized applications + application: Application + created_at: Created At + date_format: "%Y-%m-%d %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: The request is missing a required parameter, includes an unsupported + parameter value, or is otherwise malformed. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: The requested redirect uri is malformed or doesn't match + client redirect URI. + unauthorized_client: The client is not authorized to perform this request + using this method. + access_denied: The resource owner or authorization server denied the request. + invalid_scope: The requested scope is invalid, unknown, or malformed. + invalid_code_challenge_method: + zero: + one: + other: + server_error: The authorization server encountered an unexpected condition + which prevented it from fulfilling the request. + temporarily_unavailable: The authorization server is currently unable to handle + the request due to a temporary overloading or maintenance of the server. + credential_flow_not_configured: Resource Owner Password Credentials flow failed + due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured. + resource_owner_authenticator_not_configured: Resource Owner find failed due + to Doorkeeper.configure.resource_owner_authenticator being unconfigured. + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: The authorization server does not support this + response type. + unsupported_response_mode: + invalid_client: Client authentication failed due to unknown client, no client + authentication included, or unsupported authentication method. + invalid_grant: The provided authorization grant is invalid, expired, revoked, + does not match the redirection URI used in the authorization request, or + was issued to another client. + unsupported_grant_type: The authorization grant type is not supported by the + authorization server. + invalid_token: + revoked: The access token was revoked + expired: The access token expired + unknown: The access token is invalid + revoke: + unauthorized: You are not authorized to revoke this token + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Application created. + destroy: + notice: Application deleted. + update: + notice: Application updated. + authorized_applications: + destroy: + notice: Application revoked. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: OAuth2 Provider + applications: Applications + home: Home + application: + title: OAuth authorization required diff --git a/config/locales/translation.es.yml b/config/locales/translation.es.yml index 7491ded07f..ba5ef434ce 100644 --- a/config/locales/translation.es.yml +++ b/config/locales/translation.es.yml @@ -141,6 +141,22 @@ es: restrict_dependent_destroy: has_one: No se puede eliminar el registro porque existe un %{record} dependiente has_many: No se puede eliminar el registro porque existen %{record} dependientes + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: no puede contener un fragmento. + invalid_uri: debe ser una URI válida. + unspecified_scheme: debe especificar un esquema. + relative_uri: debe ser una URI absoluta. + secured_uri: debe ser una URI HTTPS/SSL. + forbidden_uri: está prohibido por el servidor. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Nombre + redirect_uri: URI de redirección datetime: distance_in_words: half_a_minute: medio minuto @@ -353,3 +369,144 @@ es: verification_failed: La verificación reCAPTCHA falló, por favor intente nuevamente. recaptcha_unreachable: Vaya, no hemos podido validar su respuesta reCAPTCHA. Inténtalo de nuevo. + doorkeeper: + applications: + confirmations: + destroy: "¿Estás seguro?" + buttons: + edit: Editar + destroy: Eliminar + submit: Enviar + cancel: Cancelar + authorize: Autorizar + form: + error: Ups! Verifica tu formulario por posibles errores + help: + confidential: Application will be used where the client secret can be kept + confidential. Native mobile apps and Single Page Apps are considered non-confidential. + redirect_uri: Usa una linea por URI + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Separa los ámbitos con espacios. Deja en blanco para usar los ámbitos + predeterminados. + edit: + title: Editar aplicación + index: + title: Tus aplicaciones + new: Nueva aplicación + name: Nombre + callback_url: Callback URL + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': Sí + 'no': 'No' + new: + title: Nueva aplicación + show: + title: 'Aplicación: %{name}' + application_id: Identificador de aplicación + secret: Secret + secret_hashed: + scopes: Ámbitos + confidential: Confidential + callback_urls: Callback urls + actions: Acciones + not_defined: + authorizations: + buttons: + authorize: Autorizar + deny: Denegar + error: + title: Ha ocurrido un error + new: + title: Autorización requerida + prompt: "¿Autorizas a %{client_name} para usar tu cuenta?" + able_to: Está aplicación tendrá permisos para + show: + title: Código de autorización + form_post: + title: + authorized_applications: + confirmations: + revoke: "¿Estás seguro?" + buttons: + revoke: Revocar + index: + title: Tus aplicaciones autorizadas + application: Aplicación + created_at: Creada el + date_format: "%d/%m/%Y %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: La petición no tiene un parámetro obligatorio, incluye un valor + de parámetro incompatible, o tiene un formato incorrecto. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: La uri de redirección no es valida. + unauthorized_client: El cliente no tiene autorización para realizar esta petición + utilizando este método. + access_denied: El propietario del recurso o el servidor de autorización han + denegado la petición. + invalid_scope: El scope solicitado no es válido, es desconocido, o tiene un + formato incorrecto. + invalid_code_challenge_method: + zero: + one: + other: + server_error: El servidor de autorización ha encontrado una condición inesperada + que le ha impedido completar la petición. + temporarily_unavailable: El servidor de autorización no ha podido manejar + la petición por una sobrecarga temporal o por mantenimiento del servidor. + credential_flow_not_configured: El flujo de credenciales del propietario del + recurso ha fallado porque Doorkeeper.configure.resource_owner_from_credentials + no está configurado. + resource_owner_authenticator_not_configured: La búsqueda del propietario del + recurso ha fallado porque Doorkeeper.configure.resource_owner_authenticator + no está configurado. + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: El servidor de autorización no soporta este tipo + de respuesta. + unsupported_response_mode: + invalid_client: La autenticación del cliente ha fallado por cliente desconocido, + cliente no autenticado, o método de autenticación incompatible. + invalid_grant: La autorización proporcionada no es válida, ha expirado, se + ha revocado, no coincide con la URI de redirección utilizada en la petición + de autorización, o ha sido solicitada por otro cliente. + unsupported_grant_type: El tipo de autorización no está soportada por el servidor + de autorización. + invalid_token: + revoked: El token de acceso ha sido revocado + expired: El token de acceso ha expirado + unknown: El token de acceso es inválido + revoke: + unauthorized: No tiene autorización para revocar este token + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Aplicación creada. + destroy: + notice: Aplicación eliminada. + update: + notice: Aplicación actualizada. + authorized_applications: + destroy: + notice: Aplicación revocada. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: Proveedor OAuth2 + applications: Aplicaciones + home: Home + application: + title: Autorización OAuth requerida diff --git a/config/locales/translation.fi.yml b/config/locales/translation.fi.yml index 7b6eda4977..287ae72e94 100644 --- a/config/locales/translation.fi.yml +++ b/config/locales/translation.fi.yml @@ -138,6 +138,22 @@ fi: restrict_dependent_destroy: has_one: Ei voida poistaa mallia koska tästä riippuvainen %{record} löytyy has_many: Ei voida poistaa mallia koska tästä riippuvaisia %{record} löytyy + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: ei voi sisältää URI fragmenttia. + invalid_uri: täytyy olla validi URI. + unspecified_scheme: täytyy määrittää järjestelmä. + relative_uri: täytyy olla absoluuttinen URI. + secured_uri: täytyy olla HTTPS/SSL URI. + forbidden_uri: on kielletty palvelimella. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Nimi + redirect_uri: Uudelleenohjauksen URI datetime: distance_in_words: half_a_minute: puoli minuuttia @@ -346,3 +362,143 @@ fi: verification_failed: reCAPTCHA-vahvistus epäonnistui, yritä uudelleen. recaptcha_unreachable: Hups, emme vahvistaneet reCAPTCHA-vastaustasi. Yritä uudelleen. + doorkeeper: + applications: + confirmations: + destroy: Oletko varma? + buttons: + edit: Muokkaa + destroy: Poista + submit: Lähetä + cancel: Peruuta + authorize: Valtuuta + form: + error: Hups! Tarkasta lomakkeesi mahdollisten virheiden varalta. + help: + confidential: Application will be used where the client secret can be kept + confidential. Native mobile apps and Single Page Apps are considered non-confidential. + redirect_uri: Yksi URI riviä kohden + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Erottele näkyvyysalueet välilyönnein. Jätä tyhjäksi, mikäli haluat + käyttää oletusnäkyvyysalueita. + edit: + title: Muokkaa sovellusta + index: + title: Omat sovellukset + new: Uusi sovellus + name: Nimi + callback_url: Callback URL + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': Joo + 'no': Ei + new: + title: Uusi sovellus + show: + title: 'Sovellus: %{name}' + application_id: Sovelluksen UID + secret: Salainen avain + secret_hashed: Salainen tiivistetty + scopes: Näkyvyysalueet + confidential: Confidential + callback_urls: Callback URL:t + actions: Toiminnot + not_defined: Ei määritelty + authorizations: + buttons: + authorize: Valtuuta + deny: Kiellä + error: + title: Virhe + new: + title: Valtuutus vaadittu + prompt: Valtuuta %{client_name} käyttämään tiliäsi? + able_to: Tämä sovellus pystyy + show: + title: Valtuutuskoodi + form_post: + title: Lähetä tämä lomake + authorized_applications: + confirmations: + revoke: Oletko varma? + buttons: + revoke: Evää + index: + title: Valtuuttamasi sovellukset + application: Sovellukset + created_at: Valtuutettu + date_format: "%d. %m. %Y klo %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: Pyynnöstä puuttuu vaadittu parametri, se sisältää virheellisen + parametrin arvon tai on muutoin väärin muodostettu. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: Uudelleenohjauksen URI ei ole validi. + unauthorized_client: Asiakasohjelmaa ei ole valtuutettu suorittamaan haluttua + pyyntöä käyttäen tätä metodia. + access_denied: Resurssin omistaja tai valtuutuspalvelin kieltäytyi suorittamasta + pyyntöä. + invalid_scope: Pyynnön näkyvyysalue on virheellinen, tuntematon tai väärin + muodostettu. + invalid_code_challenge_method: + zero: Valtuutuspalvelin ei tue PKCE:tä, koska hyväksyttyjä code_challenge_method-arvoja + ei ole. + one: Koodihaastemetodin on oltava muotoa %{challenge_methods}. + other: 'Koodihaastemetodin on oltava jokin seuraavista: %{challenge_methods}.' + server_error: Valtuutuspalvelin kohtasi odottamattoman tilan, jonka seurauksena + se ei pystynyt suorittamaan pyyntöä. + temporarily_unavailable: Valtuutuspalvelin ei tällä hetkellä pysty suorittamaan + pyyntöä väliaikaisen ylikuormituksen tai palvelinhuollon takia. + credential_flow_not_configured: '"Resource Owner Password Credentials flow" + - proseduuri epäonnistui, koska Doorkeeper.configure.resource_owner_from_credentials + -asetusta ei ole konfiguroitu.' + resource_owner_authenticator_not_configured: '"Resource Owner find" - proseduuri + epäonnistui, koska Doorkeeper.configure.resource_owner_authenticator -asetusta + ei ole konfiguroitu.' + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: Valtuutuspalvelin ei tue tämän tyyppisiä vastauksia. + unsupported_response_mode: Valtuutuspalvelin ei tue tätä vastaustilaa. + invalid_client: Asiakasohjelman valtuutus epäonnistui tuntemattoman asiakasohjelman, + virheellisen valtuutuksen tai tukemattoman valtuutusmetodin takia. + invalid_grant: Toimitettu valtuutus on virheellinen, vanhentunut, evätty, + se ei vastaa valtuutuspyynnön uudelleenohjauksen URI:a tai sen on myöntänyt + toinen asiakasohjelma. + unsupported_grant_type: Valtuutuspalvelin ei tue tämän tyyppisiä valtuutuksia. + invalid_token: + revoked: Pääsyoikeus evätty + expired: Pääsyoikeus vanhentunut + unknown: Pääsyoikeus virheellinen + revoke: + unauthorized: You are not authorized to revoke this token + forbidden_token: + missing_scope: Tämän resurssin käyttö edellyttää laajuutta "%{oauth_scopes}". + flash: + applications: + create: + notice: Sovellus luotu. + destroy: + notice: Sovellus poistettu. + update: + notice: Sovellus päivitetty. + authorized_applications: + destroy: + notice: Sovellus evätty. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: OAuth2 tarjoaja + applications: Sovellukset + home: Etusivu + application: + title: OAuth valtuutus vaadittu. diff --git a/config/locales/translation.fr-CA.yml b/config/locales/translation.fr-CA.yml index 8f23004765..10db3d80b6 100644 --- a/config/locales/translation.fr-CA.yml +++ b/config/locales/translation.fr-CA.yml @@ -144,6 +144,22 @@ fr-CA: la) %{record} dépendant(e) has_many: Vous ne pouvez pas supprimer l’enregistrement en raison du (de la) %{record} dépendant(e) + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: ne peut contenir un fragment. + invalid_uri: doit être une URL valide. + unspecified_scheme: doit spécifier un schéma. + relative_uri: doit être une URL absolue. + secured_uri: doit être une URL HTTP/SSL. + forbidden_uri: est interdit par le serveur. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Nom + redirect_uri: L'URL de redirection datetime: distance_in_words: half_a_minute: une demi-minute @@ -242,7 +258,8 @@ fr-CA: not_found_in_database: "%{authentication_keys} ou mot de passe incorrect." timeout: Votre session est expirée. Veuillez vous reconnecter pour continuer. unauthenticated: Vous devez vous connecter ou vous inscrire pour continuer. - unconfirmed: Vous devez confirmer votre adresse courriel pour continuer. + unconfirmed: Vous devez confirmer votre compte avant de continuer. (cliquez pour demander un nouveau courriel de confirmation) invited: Vous avez une invitation en attente. Acceptez-la pour terminer la création de votre compte. mailer: @@ -363,3 +380,148 @@ fr-CA: previous: "‹ précédent(e)" next: "› suivant(e)" truncate: "…" + doorkeeper: + applications: + confirmations: + destroy: Êtes-vous certain? + buttons: + edit: Modifier + destroy: Supprimer + submit: Envoyer + cancel: Annuler + authorize: Autoriser + form: + error: Oups! Vérifier votre formulaire pour des erreurs possibles + help: + confidential: | + L'application sera utilisée quand la confidentialité du secret pourra + être maintenue. Les application mobile native, et les Applications + mono-page ne sont pas considérées comme sûr. + redirect_uri: Utiliser une ligne par URL + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Utilisez un espace entre chaque portée. Laissez vide pour utiliser + la portée par defaut + edit: + title: Modifier l'application + index: + title: Vos applications + new: Nouvelle application + name: Nom + callback_url: URL de retour d'appel + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': Oui + 'no': Non + new: + title: Nouvelle application + show: + title: 'Application : %{name}' + application_id: ID de l'application + secret: Secret + secret_hashed: + scopes: Portées + confidential: Confidential + callback_urls: URL du retour d'appel + actions: Actions + not_defined: + authorizations: + buttons: + authorize: Autoriser + deny: Refuser + error: + title: Une erreur est survenue + new: + title: Autorisation requise + prompt: Autorisez %{client_name} à utiliser votre compte? + able_to: Cette application pourra + show: + title: Code d'autorisation + form_post: + title: + authorized_applications: + confirmations: + revoke: Êtes-vous certain? + buttons: + revoke: Annuler + index: + title: Vos applications autorisées + application: Application + created_at: Créé le + date_format: "%Y-%m-%d %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: La demande manque un paramètre requis, inclut une valeur de paramètre + non prise en charge, ou est autrement mal formée. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: L'URL de redirection n'est pas valide. + unauthorized_client: Le client n'est pas autorisé à effectuer cette demande + à l'aide de cette méthode. + access_denied: Le propriétaire de la ressource ou le serveur d'autorisation + a refusé la demande. + invalid_scope: Le scope demandé n'est pas valide, est inconnu, ou est mal + formé. + invalid_code_challenge_method: + zero: + one: + other: + server_error: Le serveur d'autorisation a rencontré une condition inattendue + qui l'a empêché de remplir la demande. + temporarily_unavailable: Le serveur d'autorisation est actuellement incapable + de traiter la demande à cause d'une surcharge ou d'un entretien temporaire + du serveur. + credential_flow_not_configured: Le flux des identifiants du mot de passe du + propriétaire de la ressource a échoué en raison de Doorkeeper.configure.resource_owner_from_credentials + n'est pas configuré. + resource_owner_authenticator_not_configured: La recherche du propriétaire + de la ressource a échoué en raison de Doorkeeper.configure.resource_owner_authenticator + n'est pas configuré. + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: Le serveur d'autorisation ne prend pas en charge + ce type de réponse. + unsupported_response_mode: + invalid_client: L'authentification du client a échoué à cause d'un client + inconnu, d'aucune authentification de client incluse, ou d'une méthode d'authentification + non prise en charge. + invalid_grant: Le consentement d'autorisation accordé n'est pas valide, a + expiré, est annulé, ne concorde pas avec l'URL de redirection utilisée dans + la demande d'autorisation, ou a été émis à un autre client. + unsupported_grant_type: Le type de consentement d'autorisation n'est pas pris + en charge par le serveur d'autorisation. + invalid_token: + revoked: Le jeton d'accès a été annulé + expired: Le jeton d'accès a expiré + unknown: Le jeton d'accès n'est pas valide + revoke: + unauthorized: Vous n'êtes pas autorisé à révoquer ce jeton + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Application créée. + destroy: + notice: Application supprimée. + update: + notice: Application mise à jour. + authorized_applications: + destroy: + notice: Application annulée. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: Fournisseur OAuth2 + applications: Applications + home: Home + application: + title: Autorisation OAuth requise diff --git a/config/locales/translation.fr-FR.yml b/config/locales/translation.fr-FR.yml index ea80971e67..d541b9a742 100644 --- a/config/locales/translation.fr-FR.yml +++ b/config/locales/translation.fr-FR.yml @@ -144,6 +144,22 @@ fr-FR: dépendant(e) existe has_many: Vous ne pouvez pas supprimer l'enregistrement parce que les %{record} dépendants existent + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: ne peut contenir un fragment. + invalid_uri: doit être une URL valide. + unspecified_scheme: doit spécifier un schéma. + relative_uri: doit être une URL absolue. + secured_uri: doit être une URL HTTP/SSL. + forbidden_uri: est interdit par le serveur. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Nom + redirect_uri: L'URL de redirection datetime: distance_in_words: half_a_minute: une demi-minute @@ -360,3 +376,148 @@ fr-FR: verification_failed: La vérification reCAPTCHA a échoué, veuillez réessayer. recaptcha_unreachable: Oups, nous n'avons pas réussi à valider votre réponse reCAPTCHA. Veuillez réessayer. + doorkeeper: + applications: + confirmations: + destroy: Êtes-vous certain? + buttons: + edit: Modifier + destroy: Supprimer + submit: Envoyer + cancel: Annuler + authorize: Autoriser + form: + error: Oups! Vérifier votre formulaire pour des erreurs possibles + help: + confidential: | + L'application sera utilisée quand la confidentialité du secret pourra + être maintenue. Les application mobile native, et les Applications + mono-page ne sont pas considérées comme sûr. + redirect_uri: Utiliser une ligne par URL + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: Utilisez un espace entre chaque portée. Laissez vide pour utiliser + la portée par defaut + edit: + title: Modifier l'application + index: + title: Vos applications + new: Nouvelle application + name: Nom + callback_url: URL de retour d'appel + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': Oui + 'no': Non + new: + title: Nouvelle application + show: + title: 'Application : %{name}' + application_id: ID de l'application + secret: Secret + secret_hashed: + scopes: Portées + confidential: Confidential + callback_urls: URL du retour d'appel + actions: Actions + not_defined: + authorizations: + buttons: + authorize: Autoriser + deny: Refuser + error: + title: Une erreur est survenue + new: + title: Autorisation requise + prompt: Autorisez %{client_name} à utiliser votre compte? + able_to: Cette application pourra + show: + title: Code d'autorisation + form_post: + title: + authorized_applications: + confirmations: + revoke: Êtes-vous certain? + buttons: + revoke: Annuler + index: + title: Vos applications autorisées + application: Application + created_at: Créé le + date_format: "%Y-%m-%d %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: La demande manque un paramètre requis, inclut une valeur de paramètre + non prise en charge, ou est autrement mal formée. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: L'URL de redirection n'est pas valide. + unauthorized_client: Le client n'est pas autorisé à effectuer cette demande + à l'aide de cette méthode. + access_denied: Le propriétaire de la ressource ou le serveur d'autorisation + a refusé la demande. + invalid_scope: Le scope demandé n'est pas valide, est inconnu, ou est mal + formé. + invalid_code_challenge_method: + zero: + one: + other: + server_error: Le serveur d'autorisation a rencontré une condition inattendue + qui l'a empêché de remplir la demande. + temporarily_unavailable: Le serveur d'autorisation est actuellement incapable + de traiter la demande à cause d'une surcharge ou d'un entretien temporaire + du serveur. + credential_flow_not_configured: Le flux des identifiants du mot de passe du + propriétaire de la ressource a échoué en raison de Doorkeeper.configure.resource_owner_from_credentials + n'est pas configuré. + resource_owner_authenticator_not_configured: La recherche du propriétaire + de la ressource a échoué en raison de Doorkeeper.configure.resource_owner_authenticator + n'est pas configuré. + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: Le serveur d'autorisation ne prend pas en charge + ce type de réponse. + unsupported_response_mode: + invalid_client: L'authentification du client a échoué à cause d'un client + inconnu, d'aucune authentification de client incluse, ou d'une méthode d'authentification + non prise en charge. + invalid_grant: Le consentement d'autorisation accordé n'est pas valide, a + expiré, est annulé, ne concorde pas avec l'URL de redirection utilisée dans + la demande d'autorisation, ou a été émis à un autre client. + unsupported_grant_type: Le type de consentement d'autorisation n'est pas pris + en charge par le serveur d'autorisation. + invalid_token: + revoked: Le jeton d'accès a été annulé + expired: Le jeton d'accès a expiré + unknown: Le jeton d'accès n'est pas valide + revoke: + unauthorized: Vous n'êtes pas autorisé à révoquer ce jeton + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Application créée. + destroy: + notice: Application supprimée. + update: + notice: Application mise à jour. + authorized_applications: + destroy: + notice: Application annulée. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: Fournisseur OAuth2 + applications: Applications + home: Home + application: + title: Autorisation OAuth requise diff --git a/config/locales/translation.pt-BR.yml b/config/locales/translation.pt-BR.yml index 9f39d22fb1..dbe1229130 100644 --- a/config/locales/translation.pt-BR.yml +++ b/config/locales/translation.pt-BR.yml @@ -143,6 +143,22 @@ pt-BR: restrict_dependent_destroy: has_one: Não é possível excluir o registro pois existe um %{record} dependente has_many: Não é possível excluir o registro pois existem %{record} dependentes + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: Não pode conter um fragmento. + invalid_uri: deve ser uma URI válida. + unspecified_scheme: must specify a scheme. + relative_uri: dever ser uma URI absoluta. + secured_uri: deve ser uma URI HTTPS/SSL. + forbidden_uri: is forbidden by the server. + scopes: + not_match_configured: doesn't match configured on the server. + attributes: + doorkeeper/application: + name: Nome + redirect_uri: URI de redirecionamento datetime: distance_in_words: half_a_minute: meio minuto @@ -357,3 +373,143 @@ pt-BR: verification_failed: A verificação do reCAPTCHA falhou. Tente novamente. recaptcha_unreachable: Ops, não foi possível validar sua resposta do reCAPTCHA. Por favor, tente novamente. + doorkeeper: + applications: + confirmations: + destroy: Você tem certeza? + buttons: + edit: Editar + destroy: Deletar + submit: Submeter + cancel: Cancelar + authorize: Autorizar + form: + error: Whoops! Veja o form para possíveis erros + help: + confidential: Application will be used where the client secret can be kept + confidential. Native mobile apps and Single Page Apps are considered non-confidential. + redirect_uri: Use uma linha por URI + blank_redirect_uri: Leave it blank if you configured your provider to use + Client Credentials, Resource Owner Password Credentials or any other grant + type that doesn't require redirect URI. + scopes: + edit: + title: Editar aplicação + index: + title: Suas aplicações + new: Nova Aplicação + name: Nome + callback_url: URL de Callback + confidential: Confidential? + actions: Actions + confidentiality: + 'yes': Sim + 'no': Não + new: + title: Nova Aplicação + show: + title: 'Aplicação: %{name}' + application_id: Id da Aplicação (Application UID) + secret: Segredo (Secret) + secret_hashed: + scopes: + confidential: Confidential + callback_urls: urls de Callback + actions: Ações + not_defined: + authorizations: + buttons: + authorize: Autorizar + deny: Negar + error: + title: Ocorreu um erro + new: + title: Autorização necessária + prompt: Autorizar %{client_name} a usar sua conta? + able_to: Essa aplicação será capaz de + show: + title: Código de autorização + form_post: + title: + authorized_applications: + confirmations: + revoke: Você tem certeza? + buttons: + revoke: Revogar + index: + title: Suas aplicações autorizadas + application: Aplicação + created_at: Criado em + date_format: "%Y-%m-%d %H:%M:%S" + pre_authorization: + status: Pre-authorization + errors: + messages: + invalid_request: + unknown: A requisição não possui um parâmetro obrigatório, inclui um parâmetro + inválido ou está malformada. + missing_param: 'Missing required parameter: %{value}.' + request_not_authorized: Request need to be authorized. Required parameter + for authorizing request is missing or invalid. + invalid_code_challenge: + invalid_redirect_uri: A uri de redirecionamento incluída não é válida. + unauthorized_client: O cliente não está autorizado a realizar essa requisição + usando este método. + access_denied: O dono do recurso (resource owner) ou servidor de autorização + (authorization server) negou a requisição. + invalid_scope: O escopo requisitado é inválido, desconhecido ou malformado. + invalid_code_challenge_method: + zero: + one: + other: + server_error: O servidor de autorização (authorization server) encontrou uma + condição inesperada que o impediu de completar a requisição. + temporarily_unavailable: O servidor de autorização (authorization server) + não foi rapaz de processar a requisição devido a um problema tempoário de + sobrecarga ou manuntenção. + credential_flow_not_configured: Resource Owner Password Credentials flow falhou + porque o Doorkeeper.configure.resource_owner_from_credentials não foi configurado. + resource_owner_authenticator_not_configured: Resource Owner find falhou porque + o Doorkeeper.configure.resource_owner_authenticator não foi configurado. + admin_authenticator_not_configured: Access to admin panel is forbidden due + to Doorkeeper.configure.admin_authenticator being unconfigured. + unsupported_response_type: O servidor de autorização não suporta este tipo + de resposta. + unsupported_response_mode: + invalid_client: Autenticação do cliente falhou devido a um cliente desconhecido, + a falta de inclusão da autenticação do cliente, ou a um método não suportado + de autenticação. + invalid_grant: A permissão de autorização (authorization grant) provida é + inválida, expirada, revogada, não bate com a URI de redirecionamento usada + na requisição de autorização, ou foi dada a outro cliente. + unsupported_grant_type: O tipo de permissão de autorização (authorization + grant) não é suportado pelo servidor de autorização(authorization server) + The authorization grant type is not supported by the authorization server. + invalid_token: + revoked: O token de acesso (access token) foi revogado + expired: O token de acesso (access token) expirou + unknown: O token de acesso (access token) é inválido + revoke: + unauthorized: You are not authorized to revoke this token + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: Aplicação criada. + destroy: + notice: Aplicação deletada. + update: + notice: Aplicação atualizada. + authorized_applications: + destroy: + notice: Aplicação revogada. + layouts: + admin: + title: Doorkeeper + nav: + oauth2_provider: Provedor OAuth2 (OAuth2 Provider) + applications: Aplicações + home: Home + application: + title: Autorização OAuth necessária diff --git a/config/locales/translation.sv-FI.yml b/config/locales/translation.sv-FI.yml index db0e54cc33..9a8a99b0b3 100644 --- a/config/locales/translation.sv-FI.yml +++ b/config/locales/translation.sv-FI.yml @@ -141,6 +141,22 @@ sv-FI: restrict_dependent_destroy: has_one: Kan inte ta bort post då beroende %{record} finns has_many: Kan inte ta bort poster då beroende %{record} finns + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: + invalid_uri: + unspecified_scheme: + relative_uri: + secured_uri: + forbidden_uri: + scopes: + not_match_configured: + attributes: + doorkeeper/application: + name: Namn + redirect_uri: datetime: distance_in_words: half_a_minute: en halv minut @@ -351,3 +367,123 @@ sv-FI: verification_failed: verifiering av reCAPTCHA misslyckades, försök igen. recaptcha_unreachable: Oj, vi kunde inte validera ditt reCAPTCHA-svar. Var god försök igen. + doorkeeper: + applications: + confirmations: + destroy: Är du säker? + buttons: + edit: Redigera + destroy: + submit: Skicka + cancel: Annullera + authorize: + form: + error: + help: + confidential: + redirect_uri: + blank_redirect_uri: + scopes: + edit: + title: + index: + title: + new: + name: Namn + callback_url: + confidential: + actions: Åtgärder + confidentiality: + 'yes': Ja + 'no': Nej + new: + title: + show: + title: + application_id: + secret: + secret_hashed: + scopes: + confidential: + callback_urls: + actions: Åtgärder + not_defined: + authorizations: + buttons: + authorize: + deny: + error: + title: + new: + title: + prompt: + able_to: + show: + title: + form_post: + title: + authorized_applications: + confirmations: + revoke: Är du säker? + buttons: + revoke: + index: + title: + application: + created_at: + date_format: + pre_authorization: + status: + errors: + messages: + invalid_request: + unknown: + missing_param: + request_not_authorized: + invalid_code_challenge: + invalid_redirect_uri: + unauthorized_client: + access_denied: + invalid_scope: + invalid_code_challenge_method: + zero: + one: + other: + server_error: + temporarily_unavailable: + credential_flow_not_configured: + resource_owner_authenticator_not_configured: + admin_authenticator_not_configured: + unsupported_response_type: + unsupported_response_mode: + invalid_client: + invalid_grant: + unsupported_grant_type: + invalid_token: + revoked: + expired: + unknown: + revoke: + unauthorized: + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: + destroy: + notice: + update: + notice: + authorized_applications: + destroy: + notice: + layouts: + admin: + title: + nav: + oauth2_provider: + applications: + home: Hem + application: + title: diff --git a/config/locales/translation.tr-TR.yml b/config/locales/translation.tr-TR.yml index ce56653e18..379e8db76e 100644 --- a/config/locales/translation.tr-TR.yml +++ b/config/locales/translation.tr-TR.yml @@ -146,6 +146,22 @@ tr-TR: restrict_dependent_destroy: has_one: Bağlı bir %{record} bulunduğu için kayıt silinemiyor has_many: Bağlı %{record} bulunduğu için kayıt silinemiyor + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: + invalid_uri: + unspecified_scheme: + relative_uri: + secured_uri: + forbidden_uri: + scopes: + not_match_configured: + attributes: + doorkeeper/application: + name: isim + redirect_uri: datetime: distance_in_words: half_a_minute: yarım dakika @@ -351,3 +367,123 @@ tr-TR: notices: error: Her iki alanı da doldurmalısınız. success: İletişim e-postası başarıyla gönderildi. + doorkeeper: + applications: + confirmations: + destroy: Emin misiniz? + buttons: + edit: Düzenle + destroy: + submit: Gönder + cancel: İptal + authorize: + form: + error: + help: + confidential: + redirect_uri: + blank_redirect_uri: + scopes: + edit: + title: + index: + title: + new: + name: isim + callback_url: + confidential: + actions: Eylemler + confidentiality: + 'yes': Evet + 'no': Yok + new: + title: + show: + title: + application_id: + secret: + secret_hashed: + scopes: + confidential: + callback_urls: + actions: Eylemler + not_defined: + authorizations: + buttons: + authorize: + deny: + error: + title: + new: + title: + prompt: + able_to: + show: + title: + form_post: + title: + authorized_applications: + confirmations: + revoke: Emin misiniz? + buttons: + revoke: + index: + title: + application: + created_at: + date_format: + pre_authorization: + status: + errors: + messages: + invalid_request: + unknown: + missing_param: + request_not_authorized: + invalid_code_challenge: + invalid_redirect_uri: + unauthorized_client: + access_denied: + invalid_scope: + invalid_code_challenge_method: + zero: + one: + other: + server_error: + temporarily_unavailable: + credential_flow_not_configured: + resource_owner_authenticator_not_configured: + admin_authenticator_not_configured: + unsupported_response_type: + unsupported_response_mode: + invalid_client: + invalid_grant: + unsupported_grant_type: + invalid_token: + revoked: + expired: + unknown: + revoke: + unauthorized: + forbidden_token: + missing_scope: + flash: + applications: + create: + notice: + destroy: + notice: + update: + notice: + authorized_applications: + destroy: + notice: + layouts: + admin: + title: + nav: + oauth2_provider: + applications: + home: Ana sayfa + application: + title: diff --git a/config/routes.rb b/config/routes.rb index 0155b2d406..f9d4bd29f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ # rubocop:disable Metrics/BlockLength Rails.application.routes.draw do + use_doorkeeper # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html devise_for(:users, controllers: { @@ -203,6 +204,14 @@ resources :plans, only: %i[create show index] resources :templates, only: [:index] end + + namespace :v2 do + get :heartbeat, controller: :base_api + get :me, controller: :base_api + + resources :plans, only: %i[index show] + resources :templates, only: :index + end end namespace :paginable do diff --git a/db/migrate/20251119131055_create_doorkeeper_tables.rb b/db/migrate/20251119131055_create_doorkeeper_tables.rb new file mode 100644 index 0000000000..c7ee41b979 --- /dev/null +++ b/db/migrate/20251119131055_create_doorkeeper_tables.rb @@ -0,0 +1,98 @@ +# frozen_string_literal: true + +class CreateDoorkeeperTables < ActiveRecord::Migration[7.1] + def change + create_table :oauth_applications do |t| + t.string :name, null: false + t.string :uid, null: false + t.string :secret, null: false + + # Remove `null: false` if you are planning to use grant flows + # that doesn't require redirect URI to be used during authorization + # like Client Credentials flow or Resource Owner Password. + t.text :redirect_uri, null: false + t.string :scopes, null: false, default: '' + t.boolean :confidential, null: false, default: true + t.timestamps null: false + end + + add_index :oauth_applications, :uid, unique: true + + create_table :oauth_access_grants do |t| + t.references :resource_owner, null: false + t.references :application, null: false + t.string :token, null: false + t.integer :expires_in, null: false + t.text :redirect_uri, null: false + t.string :scopes, null: false, default: '' + t.datetime :created_at, null: false + t.datetime :revoked_at + end + + add_index :oauth_access_grants, :token, unique: true + add_foreign_key( + :oauth_access_grants, + :oauth_applications, + column: :application_id + ) + + create_table :oauth_access_tokens do |t| + t.references :resource_owner, index: true + + # Remove `null: false` if you are planning to use Password + # Credentials Grant flow that doesn't require an application. + t.references :application, null: false + + # If you use a custom token generator you may need to change this column + # from string to text, so that it accepts tokens larger than 255 + # characters. More info on custom token generators in: + # https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator + # + # t.text :token, null: false + t.string :token, null: false + + t.string :refresh_token + t.integer :expires_in + t.string :scopes + t.datetime :created_at, null: false + t.datetime :revoked_at + + # The authorization server MAY issue a new refresh token, in which case + # *the client MUST discard the old refresh token* and replace it with the + # new refresh token. The authorization server MAY revoke the old + # refresh token after issuing a new refresh token to the client. + # @see https://datatracker.ietf.org/doc/html/rfc6749#section-6 + # + # Doorkeeper implementation: if there is a `previous_refresh_token` column, + # refresh tokens will be revoked after a related access token is used. + # If there is no `previous_refresh_token` column, previous tokens are + # revoked as soon as a new access token is created. + # + # Comment out this line if you want refresh tokens to be instantly + # revoked after use. + t.string :previous_refresh_token, null: false, default: "" + end + + add_index :oauth_access_tokens, :token, unique: true + + # See https://github.com/doorkeeper-gem/doorkeeper/issues/1592 + if ActiveRecord::Base.connection.adapter_name == "SQLServer" + execute <<~SQL.squish + CREATE UNIQUE NONCLUSTERED INDEX index_oauth_access_tokens_on_refresh_token ON oauth_access_tokens(refresh_token) + WHERE refresh_token IS NOT NULL + SQL + else + add_index :oauth_access_tokens, :refresh_token, unique: true + end + + add_foreign_key( + :oauth_access_tokens, + :oauth_applications, + column: :application_id + ) + + # Uncomment below to ensure a valid reference to the resource owner's table + add_foreign_key :oauth_access_grants, :users, column: :resource_owner_id + add_foreign_key :oauth_access_tokens, :users, column: :resource_owner_id + end +end \ No newline at end of file diff --git a/db/migrate/20260219185224_allow_null_redirect_uri_in_oauth_applications.rb b/db/migrate/20260219185224_allow_null_redirect_uri_in_oauth_applications.rb new file mode 100644 index 0000000000..5b13d4cabd --- /dev/null +++ b/db/migrate/20260219185224_allow_null_redirect_uri_in_oauth_applications.rb @@ -0,0 +1,9 @@ +class AllowNullRedirectUriInOauthApplications < ActiveRecord::Migration[7.1] + def change + # We currently have `allow_blank_redirect_uri true` in + # `config/initializers/doorkeeper.rb`. Removing the NOT NULL constraint + # allows us to save OAuthApplications with blank redirect_uri values + # https://github.com/doorkeeper-gem/doorkeeper/wiki/Allow-blank-redirect-URI-for-Applications + change_column_null :oauth_applications, :redirect_uri, true + end +end diff --git a/db/schema.rb b/db/schema.rb index e0ec6d6956..f6468af926 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[8.1].define(version: 2025_01_15_102816) do +ActiveRecord::Schema[8.1].define(version: 2026_02_19_185224) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" @@ -246,6 +246,48 @@ t.boolean "enabled", default: true end + create_table "oauth_access_grants", force: :cascade do |t| + t.bigint "resource_owner_id", null: false + t.bigint "application_id", null: false + t.string "token", null: false + t.integer "expires_in", null: false + t.text "redirect_uri", null: false + t.string "scopes", default: "", null: false + t.datetime "created_at", null: false + t.datetime "revoked_at" + t.index ["application_id"], name: "index_oauth_access_grants_on_application_id" + t.index ["resource_owner_id"], name: "index_oauth_access_grants_on_resource_owner_id" + t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true + end + + create_table "oauth_access_tokens", force: :cascade do |t| + t.bigint "resource_owner_id" + t.bigint "application_id", null: false + t.string "token", null: false + t.string "refresh_token" + t.integer "expires_in" + t.string "scopes" + t.datetime "created_at", null: false + t.datetime "revoked_at" + t.string "previous_refresh_token", default: "", null: false + t.index ["application_id"], name: "index_oauth_access_tokens_on_application_id" + t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true + t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id" + t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true + end + + create_table "oauth_applications", force: :cascade do |t| + t.string "name", null: false + t.string "uid", null: false + t.string "secret", null: false + t.text "redirect_uri" + t.string "scopes", default: "", null: false + t.boolean "confidential", default: true, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true + end + create_table "org_token_permissions", id: :integer, force: :cascade do |t| t.integer "org_id" t.integer "token_permission_type_id" @@ -644,6 +686,10 @@ add_foreign_key "notes", "users" add_foreign_key "notification_acknowledgements", "notifications" add_foreign_key "notification_acknowledgements", "users" + add_foreign_key "oauth_access_grants", "oauth_applications", column: "application_id" + add_foreign_key "oauth_access_grants", "users", column: "resource_owner_id" + add_foreign_key "oauth_access_tokens", "oauth_applications", column: "application_id" + add_foreign_key "oauth_access_tokens", "users", column: "resource_owner_id" add_foreign_key "org_token_permissions", "orgs" add_foreign_key "org_token_permissions", "token_permission_types" add_foreign_key "orgs", "languages" diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index 124eeb09f2..9bf00e33ce 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -275,7 +275,7 @@ namespace :migrate do contact = contact.gsub(phone, '') unless phone.nil? contact = contact.gsub(/([Ee]mail|[Pp]hone|[Mm]obile|[Cc]ell|[Oo]ffice|[Hh]ome|[Ww]ork|[Tt]|[Ee]):?/, '') contact = contact.gsub(' , ', '').strip - contact = contact[0..(contact.length - 2)] if contact.ends_with?(',') + contact = contact[0..-2] if contact.ends_with?(',') contact = nil if contact == ',' p.update(data_contact_email: email, data_contact_phone: phone, data_contact: contact) diff --git a/lib/tasks/upgrade.rake b/lib/tasks/upgrade.rake index 3e4931ad14..6cb279f5c4 100644 --- a/lib/tasks/upgrade.rake +++ b/lib/tasks/upgrade.rake @@ -963,11 +963,7 @@ namespace :upgrade do end end - if out.present? - file = File.open('tmp/ror_fundref_ids.csv', 'w') - file.puts out - file.close - end + File.write('tmp/ror_fundref_ids.csv', out) if out.present? end desc 'Attempts to migrate other_organisation entries to Orgs' diff --git a/package.json b/package.json index e3cbd309fa..a975072d64 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-webpack-plugin": "^2.6.0", "jquery": "^3.5.1", - "jquery-ui": "^1.12.1", + "jquery-ui": "1.13.3", "jquery-ui-sass": "^0.0.1", "js-cookie": "^3.0.1", "number-to-text": "^0.3.8", diff --git a/spec/factories/identifier_schemes.rb b/spec/factories/identifier_schemes.rb index 609d469226..3eaf9f795f 100644 --- a/spec/factories/identifier_schemes.rb +++ b/spec/factories/identifier_schemes.rb @@ -33,5 +33,19 @@ identifier_scheme.update("#{identifier_scheme.all_context[idx]}": true) end end + + %i[ + authentication + orgs + plans + users + contributors + identification + research_outputs + ].each do |context| + trait :"for_#{context}" do + add_attribute(:"for_#{context}") { true } + end + end end end diff --git a/spec/factories/oauth_access_grants.rb b/spec/factories/oauth_access_grants.rb new file mode 100644 index 0000000000..2cd8dc8875 --- /dev/null +++ b/spec/factories/oauth_access_grants.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: oauth_access_grants +# +# id :integer not null, primary key +# resource_owner_id :integer not null +# application_id :integer not null +# token :string not null +# expires_in :integer +# revoked_at :datetime +# created_at :datetime not null +# scopes :string not null +# +# Indexes +# +# index_oauth_access_grants_on_token (token) +# +# Foreign Keys +# +# fk_rails_... (resource_owner_id => users.id) +# fk_rails_... (application_id => oauth_applications.id) + +FactoryBot.define do + factory :oauth_access_grant, class: 'doorkeeper/access_grant' do + token { SecureRandom.uuid } + expires_in { Faker::Number.number(digits: 8) } + scopes { Doorkeeper.config.default_scopes + Doorkeeper.config.optional_scopes } + redirect_uri { Faker::Internet.url } + + trait :revoked do + revoked_at { 2.hours.ago } + end + end +end diff --git a/spec/factories/oauth_access_tokens.rb b/spec/factories/oauth_access_tokens.rb new file mode 100644 index 0000000000..aa94d6b373 --- /dev/null +++ b/spec/factories/oauth_access_tokens.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: oauth_access_tokens +# +# id :integer not null, primary key +# resource_owner_id :integer not null +# application_id :integer not null +# token :string not null +# refresh_token :string +# expires_in :integer +# revoked_at :datetime +# created_at :datetime not null +# scopes :string not null +# previous_refresh_token :string +# +# Indexes +# +# index_oauth_access_tokens_on_token (token) +# +# Foreign Keys +# +# fk_rails_... (resource_owner_id => users.id) +# fk_rails_... (application_id => oauth_applications.id) + +FactoryBot.define do + factory :oauth_access_token, class: 'doorkeeper/access_token' do + token { SecureRandom.uuid } + refresh_token { SecureRandom.uuid } + expires_in { Faker::Number.number(digits: 8) } + scopes { Doorkeeper.config.default_scopes + Doorkeeper.config.optional_scopes } + + trait :revoked do + revoked_at { 2.hours.ago } + end + end +end diff --git a/spec/factories/oauth_applications.rb b/spec/factories/oauth_applications.rb new file mode 100644 index 0000000000..469dd66269 --- /dev/null +++ b/spec/factories/oauth_applications.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: oauth_application +# +# id: :integer +# name: :string +# uid: :string +# secret: :string +# redirect_uri: :text +# scopes: :string +# confidential: :boolean +# created_at: :datetime +# updated_at: :datetime + +FactoryBot.define do + factory :oauth_application, class: 'doorkeeper/application' do + name { Faker::Lorem.unique.word } + uid { SecureRandom.uuid } + secret { SecureRandom.uuid } + redirect_uri { "https://#{Faker::Internet.unique.domain_name}/callback" } + scopes { 'read' } + end +end diff --git a/spec/factories/research_domains.rb b/spec/factories/research_domains.rb index 0823ed3d12..24ac4e2a6a 100644 --- a/spec/factories/research_domains.rb +++ b/spec/factories/research_domains.rb @@ -23,6 +23,5 @@ factory :research_domain do identifier { SecureRandom.uuid } label { Faker::Lorem.unique.word } - uri { Faker::Internet.url } end end diff --git a/spec/requests/api/v2/base_controller_spec.rb b/spec/requests/api/v2/base_controller_spec.rb new file mode 100644 index 0000000000..831aa85b2f --- /dev/null +++ b/spec/requests/api/v2/base_controller_spec.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Api::V2::BaseApiController do + include ApiHelper + + describe 'GET /api/v2/me' do + context 'OAuth (authorization_code grant type) — on behalf of a user' do + before do + @user = create(:user) + @client = create(:oauth_application) + token = mock_authorization_code_token(oauth_application: @client, user: @user).plaintext_token + + @headers = { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: "Bearer #{token}" + } + end + + it 'returns 200 OK and user details when user is active' do + get(api_v2_me_path, headers: @headers) + + expect(response).to have_http_status(:ok) + + json = JSON.parse(response.body) + expect(json['email']).to eq(@user.email) + expect(json['firstname']).to eq(@user.firstname) + expect(json['surname']).to eq(@user.surname) + expect(json['organisation']).to eq(@user.org.name) + end + + it 'returns 401 Unauthorized when user account is deactivated' do + @user.update(active: false) + + get(api_v2_me_path, headers: @headers) + + expect(response).to have_http_status(:unauthorized) + + json = JSON.parse(response.body) + expect(json['errors']).to include('User account has been deactivated.') + end + end + + context 'when no authorization token is provided' do + it 'returns 401 Unauthorized' do + get(api_v2_me_path, headers: { Accept: 'application/json' }) + + expect(response).to have_http_status(:unauthorized) + end + end + end +end diff --git a/spec/requests/api/v2/plans_controller_spec.rb b/spec/requests/api/v2/plans_controller_spec.rb new file mode 100644 index 0000000000..aeb5a1e1b9 --- /dev/null +++ b/spec/requests/api/v2/plans_controller_spec.rb @@ -0,0 +1,126 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Api::V2::PlansController do + include ApiHelper + include Mocks::ApiV2JsonSamples + include Webmocks + include IdentifierHelper + + context 'OAuth (authorization_code grant type) — on behalf of a user' do + before do + @user = create(:user) + @client = create(:oauth_application) + token = mock_authorization_code_token(oauth_application: @client, user: @user).plaintext_token + + @headers = { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: "Bearer #{token}" + } + end + + def fetch_plans_json_response + get(api_v2_plans_path, headers: @headers) + expect(response).to render_template('api/v2/_standard_response') + expect(response).to render_template('api/v2/plans/index') + JSON.parse(response.body).with_indifferent_access + end + + describe 'GET /api/v2/plans (index)' do + context 'an invalid API token is included' do + it 'returns a 401 and the expected Oauth 2.0 headers' do + # Swap actual token with a random string + @headers['Authorization'] = "Bearer #{SecureRandom.uuid}" + get(api_v2_plans_path, headers: @headers) + + expect(response.code).to eql('401') + expect(response.body).to be_empty + + # Expect Doorkeeper to return the standard OAuth 2.0 WWW-Authenticate header for invalid tokens + expect(response.headers['WWW-Authenticate']).to match( + /Bearer realm="Doorkeeper", error="invalid_token", error_description="The access token is invalid"/ + ) + end + end + + context 'a valid API token is included' do + let(:json) { fetch_plans_json_response } + it 'returns a 200 and the expected response body' do + # Items array is empty + expect(json[:items]).to eq([]) + + # total_items reflects that nothing is returned + expect(json[:total_items]).to eq(0) + + # Status code and message are correct + expect(json[:code]).to eq(200) + expect(json[:message]).to eq('OK') + + # Application and source are present and sensible + expect(json[:application]).to eq(ApplicationService.application_name) + expect(json[:source]).to eq('GET /api/v2/plans') + + # Time is present and parseable + expect { Time.iso8601(json[:time]) }.not_to raise_error + + # Caller is included + expect(json[:caller]).to eq(@client.name) + end + + it 'returns an empty array if no plans are available' do + # Items array is empty + expect(json[:items]).to eq([]) + + # total_items reflects that nothing is returned + expect(json[:total_items]).to eq(0) + end + + it 'returns the expected plans' do + # See `app/policies/api/v2/plans_policy.rb for plans included/excluded via `GET api/v2/plans` + + # Create the included plans + included_plans = [create(:plan, org: @user.org), create(:plan)] + included_plans[0].add_user!(@user.id, :creator) + # Add multiple roles for testing (ensure duplicate plans will not returned) + included_plans[1].add_user!(@user.id, :editor) + included_plans[1].add_user!(@user.id, :commenter) + + # Created the excluded plans + create(:plan, :creator, org: @user.org) + inactive_plan = create(:plan, :creator) + inactive_plan.add_user!(@user.id, :editor) + Role.where(plan_id: inactive_plan.id, user_id: @user.id).update!(active: false) + + expect(json[:items].length).to be(included_plans.length) + + # Api::V2::PlanPresenter.identifier uses api_v2_plan_url(@plan) to set the "identifier". + # That url is constructed using `request.host` / "www.example.com" + # api_v2_plan_url(@plan) within this test will construct the url via + # default_url_options[:host] / "example.org" + # Because the urls are misaligned, we will only compare the paths here. + # TODO: Consider aligning default_url_options[:host] (in test.rb) with `request.host` + returned_identifiers = json[:items].map { |item| item[:dmp][:dmp_id][:identifier] } + returned_paths = returned_identifiers.map { |url| URI(url).path } + expected_paths = included_plans.map { |plan| api_v2_plan_path(plan) } + expect(returned_paths).to eq(expected_paths) + end + + it 'allows for paging' do + original_page_size = Rails.configuration.x.application.api_max_page_size + Rails.configuration.x.application.api_max_page_size = 10 + + create_list(:plan, 11, :publicly_visible) do |plan| + plan.add_user!(@user.id, :commenter) + end + json = fetch_plans_json_response + + test_paging(json: json, headers: @headers) + + Rails.configuration.x.application.api_max_page_size = original_page_size + end + end + end + end +end diff --git a/spec/requests/api/v2/templates_controller_spec.rb b/spec/requests/api/v2/templates_controller_spec.rb new file mode 100644 index 0000000000..e84825ae51 --- /dev/null +++ b/spec/requests/api/v2/templates_controller_spec.rb @@ -0,0 +1,120 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Api::V2::TemplatesController do + include ApiHelper + + before do + @user = create(:user) + @client = create(:oauth_application) + token = mock_authorization_code_token(oauth_application: @client, user: @user).plaintext_token + + @headers = { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: "Bearer #{token}" + } + end + + def fetch_templates_json_response + get(api_v2_templates_path, headers: @headers) + expect(response).to render_template('api/v2/_standard_response') + expect(response).to render_template('api/v2/templates/index') + JSON.parse(response.body).with_indifferent_access + end + + describe 'GET /api/v2/templates (index)' do + context 'an invalid API token is included' do + it 'returns 401 if the token is invalid' do + @headers['Authorization'] = "Bearer #{SecureRandom.uuid}" + get(api_v2_templates_path, headers: @headers) + + expect(response.code).to eql('401') + expect(response.body).to be_empty + + # Expect Doorkeeper to return the standard OAuth 2.0 WWW-Authenticate header for invalid tokens + expect(response.headers['WWW-Authenticate']).to match( + /Bearer realm="Doorkeeper", error="invalid_token", error_description="The access token is invalid"/ + ) + end + end + + context 'a valid API token is included' do + it 'returns a 200 and the expected response body' do + json = fetch_templates_json_response + + # Items array is empty + expect(json[:items]).to eq([]) + + # total_items reflects that nothing is returned + expect(json[:total_items]).to eq(0) + + # Status code and message are correct + expect(json[:code]).to eq(200) + expect(json[:message]).to eq('OK') + + # Application and source are present and sensible + expect(json[:application]).to eq(ApplicationService.application_name) + expect(json[:source]).to eq('GET /api/v2/templates') + + # Time is present and parseable + expect { Time.iso8601(json[:time]) }.not_to raise_error + + # Caller is included + expect(json[:caller]).to eq(@client.name) + end + + it 'returns an empty array if no templates are available' do + get(api_v2_templates_path, headers: @headers) + + expect(response.code).to eql('200') + expect(response).to render_template('api/v2/_standard_response') + expect(response).to render_template('api/v2/templates/index') + + json = JSON.parse(response.body).with_indifferent_access + expect(json[:items].empty?).to be(true) + expect(json[:errors].nil?).to be(true) + end + + it 'returns the expected templates' do + # See `app/policies/api/v2/templates_policy.rb for templates included/excluded via `GET api/v2/templates` + + # All included templates must be published and are either: + # - 1) organisationally_visible and template.org_id == user.org_id + # - 2) publicly_visible and customization of == nil + + public_template = create(:template, :publicly_visible, published: true) + + included_templates = [ + public_template, + create(:template, :organisationally_visible, published: true, org: @user.org) + ] + + # excluded_templates + # unpublished template + create(:template, :publicly_visible, published: false, org: @user.org) + # organisationally_visible and template.org_id != user.org_id + create(:template, :organisationally_visible, published: true) + # publicly_visible and customization of != nil + create(:template, :publicly_visible, published: true, customization_of: public_template.family_id) + + json = fetch_templates_json_response + + expect(json[:items].length).to be(2) + template_ids = json[:items].map { |item| item[:dmp_template][:template_id][:identifier] } + expect(template_ids).to match_array(included_templates.map { |t| t.id.to_s }) + end + + it 'allows for paging' do + original_page_size = Rails.configuration.x.application.api_max_page_size + Rails.configuration.x.application.api_max_page_size = 10 + create_list(:template, 11, visibility: 1, published: true) + get(api_v2_templates_path, headers: @headers) + + test_paging(json: JSON.parse(response.body), headers: @headers) + Rails.configuration.x.application.api_max_page_size = original_page_size + end + end + end +end diff --git a/spec/services/api/v1/deserialization/plan_spec.rb b/spec/services/api/v1/deserialization/plan_spec.rb index b7816f9e79..ebe8d13abb 100644 --- a/spec/services/api/v1/deserialization/plan_spec.rb +++ b/spec/services/api/v1/deserialization/plan_spec.rb @@ -53,8 +53,10 @@ ], dmp_id: { type: 'doi', identifier: @identifier.value }, extension: [ - dmproadmap: { - template: { id: @template.id, title: @template.title } + { + dmproadmap: { + template: { id: @template.id, title: @template.title } + } } ] } diff --git a/spec/support/helpers/api.rb b/spec/support/helpers/api.rb index c87931c12e..2a2398dfe7 100644 --- a/spec/support/helpers/api.rb +++ b/spec/support/helpers/api.rb @@ -18,4 +18,44 @@ def mock_authorization_for_user(user: nil) Api::V1::BaseApiController.any_instance.stubs(:authorize_request).returns(true) Api::V1::BaseApiController.any_instance.stubs(:client).returns(user) end + + # API V2+ - Oauth authorization_code grant flow (on behalf of a user) + def mock_authorization_code_token(oauth_application: create(:oauth_application), user: create(:user), + scopes: 'read') + create(:oauth_access_grant, application_id: oauth_application.id, resource_owner_id: user.id, scopes: scopes) + create(:oauth_access_token, application: oauth_application, resource_owner_id: user.id, scopes: scopes) + end + + # Tests the standard pagination functionality + # rubocop:disable Metrics/AbcSize, Metrics/MethodLength + def test_paging(json: {}, headers: {}) + json = json.with_indifferent_access + original = json[:items].first + if json[:next].present? + # Move to the next page + get(json[:next], headers: headers) + expect(response.code).to eql('200') + next_json = JSON.parse(response.body).with_indifferent_access + expect(next_json[:prev].present?).to be(true) + expect(next_json[:items].first).not_to eql(original) + # Move back to previous page + get(next_json[:prev], headers: headers) + expect(response.code).to eql('200') + prev_json = JSON.parse(response.body).with_indifferent_access + expect(prev_json[:items].first).to eql(original) + elsif json[:prev].present? + get(json[:prev], headers: headers) + expect(response.code).to eql('200') + prev_json = JSON.parse(response.body).with_indifferent_access + expect(prev_json[:next].present?).to be(true) + expect(next_json[:items].first).not_to eql(original) + get(prev_json[:next], headers: headers) + expect(response.code).to eql('200') + next_json = JSON.parse(response.body).with_indifferent_access + expect(next_json[:items].first).to eql(original) + else + raise StandardError, 'Expected to test API pagination but there are not enough items!' + end + end + # rubocop:enable Metrics/AbcSize, Metrics/MethodLength end diff --git a/spec/support/mocks/api_json_samples.rb b/spec/support/mocks/api_json_samples.rb index e45ad21371..35a2ca8a1c 100644 --- a/spec/support/mocks/api_json_samples.rb +++ b/spec/support/mocks/api_json_samples.rb @@ -59,10 +59,12 @@ def minimal_create_json title: Faker::Lorem.sentence }], extension: [ - "#{ApplicationService.application_name.split('-').first}": { - template: { - id: Template.last.id, - title: Faker::Lorem.sentence + { + "#{ApplicationService.application_name.split('-').first}": { + template: { + id: Template.last.id, + title: Faker::Lorem.sentence + } } } ] diff --git a/spec/support/mocks/api_v2_json_samples.rb b/spec/support/mocks/api_v2_json_samples.rb new file mode 100644 index 0000000000..dab2dc3b9f --- /dev/null +++ b/spec/support/mocks/api_v2_json_samples.rb @@ -0,0 +1,217 @@ +# frozen_string_literal: true + +# Mock JSON submissions +module Mocks + # Disabling rubocop checks here since its basically just large hashes and + # would be difficult to read if broken up into multiple smaller functions. + # One option might be to store them as .json files and then just load them here + # but we would lose the use of Faker + + # rubocop:disable Metrics/ModuleLength, Metrics/MethodLength + module ApiV2JsonSamples + ROLES = %w[Investigation Project_administration Data_curation].freeze + + def mock_identifier_schemes + create(:identifier_scheme, name: 'ror') + create(:identifier_scheme, name: 'fundref') + create(:identifier_scheme, name: 'orcid') + create(:identifier_scheme, name: 'grant') + end + + def minimal_update_json + { + total_items: 1, + items: [ + { + dmp: { + title: Faker::Lorem.sentence, + contact: { + mbox: Faker::Internet.email, + affiliation: { name: Faker::Movies::StarWars.planet } + }, + dataset: [{ + title: Faker::Lorem.sentence + }], + dmp_id: { + type: 'doi', + identifier: SecureRandom.uuid + } + } + } + ] + }.to_json + end + + def minimal_create_json + { + dmp: { + title: Faker::Lorem.sentence, + contact: { + mbox: Faker::Internet.email, + affiliation: { name: Faker::Movies::StarWars.planet } + }, + dataset: [{ + title: Faker::Lorem.sentence + }], + extension: [ + { + "#{ApplicationService.application_name.split('-').first}": { + template: { + id: Template.last.id, + title: Faker::Lorem.sentence + } + } + } + ] + } + }.to_json + end + + # rubocop:disable Metrics/AbcSize + def complete_create_json(client: nil) + template = create(:template, :published, :publicly_visible) + lang = Language.all.pluck(:abbreviation).sample || 'en-UK' + ror_scheme = IdentifierScheme.find_or_create_by(name: 'ror') + fundref_scheme = IdentifierScheme.find_or_create_by(name: 'fundref') + ror = create(:identifier, identifiable: create(:org), identifier_scheme: ror_scheme) + fundref = create(:identifier, identifiable: create(:org), identifier_scheme: fundref_scheme) + + contact = { + name: [ + Faker::TvShows::Simpsons.character.split.first, + Faker::TvShows::Simpsons.character.split.last + ].join(' '), + email: Faker::Internet.email, + id: SecureRandom.uuid + } + + { + dmp: { + created: 3.months.ago.to_formatted_s(:iso8601), + title: Faker::Lorem.sentence, + description: Faker::Lorem.paragraph, + language: Api::V1::LanguagePresenter.three_char_code(lang: lang), + ethical_issues_exist: %w[yes no unknown].sample, + ethical_issues_description: Faker::Lorem.paragraph, + ethical_issues_report: Faker::Internet.url, + dmp_id: { + type: client.present? ? client.name.downcase : 'other', + identifier: SecureRandom.uuid + }, + contact: { + name: contact[:name], + mbox: contact[:email], + affiliation: { + name: ror.identifiable.name, + abbreviation: ror.identifiable.abbreviation, + region: Faker::Space.planet, + affiliation_id: { + type: 'ror', + identifier: ror.value + } + }, + contact_id: { + type: 'orcid', + identifier: contact[:id] + } + }, + contributor: [{ + role: [ + 'http://credit.niso.org/contributor-roles/project-administration', + 'http://credit.niso.org/contributor-roles/investigation', + 'other' + ], + name: Faker::Movies::StarWars.character, + mbox: Faker::Internet.email, + affiliation: { + name: Faker::Movies::StarWars.planet, + abbreviation: Faker::Lorem.word.upcase, + affiliation_id: { + type: 'ror', + identifier: SecureRandom.uuid + } + }, + contributor_id: { + type: 'orcid', + identifier: SecureRandom.uuid + } + }, { + role: [ + 'http://credit.niso.org/contributor-roles/investigation' + ], + name: contact[:name], + mbox: contact[:email], + affiliation: { + name: ror.identifiable.name, + abbreviation: ror.identifiable.abbreviation, + affiliation_id: { + type: 'ror', + identifier: ror.value + } + }, + contributor_id: { + type: 'orcid', + identifier: contact[:id] + } + }], + project: [{ + title: Faker::Lorem.sentence, + description: Faker::Lorem.paragraph, + start: 3.months.from_now.to_formatted_s(:iso8601), + end: 2.years.from_now.to_formatted_s(:iso8601), + funding: [{ + name: fundref.identifiable.name, + funder_id: { + type: 'fundref', + identifier: fundref.value + }, + grant_id: { + type: 'other', + identifier: SecureRandom.uuid + }, + dmproadmap_funding_opportunity_id: { + type: 'other', + identifier: SecureRandom.uuid + }, + funding_status: %w[planned rejected granted].sample + }] + }], + dataset: [{ + title: Faker::Lorem.sentence, + description: Faker::Lorem.paragraph, + personal_data: %w[yes no unknown].sample, + sensitive_data: %w[yes no unknown].sample, + issued: 6.months.from_now.to_formatted_s(:iso8601), + dataset_id: { + type: 'url', + identifier: Faker::Internet.url + }, + distribution: [{ + title: Faker::Lorem.sentence, + byte_size: Faker::Number.number(digits: 6), + data_access: %w[open embargoed restricted closed].sample, + host: { + title: Faker::Company.name, + description: Faker::Lorem.paragraph, + url: Faker::Internet.url, + dmproadmap_host_id: { + type: 'url', + identifier: Faker::Internet.url + } + }, + license: [ + { + license_ref: 'http://spdx.org/licenses/CC0-1.0.json', + start_date: 6.months.from_now.to_formatted_s(:iso8601) + } + ] + }] + }], + dmproadmap_template: { id: template.family_id, title: template.title } + } + }.to_json + end + # rubocop:enable Metrics/AbcSize + end + # rubocop:enable Metrics/ModuleLength, Metrics/MethodLength +end diff --git a/spec/views/api/v2/_standard_response.json_jbuilder_spec.rb b/spec/views/api/v2/_standard_response.json_jbuilder_spec.rb new file mode 100644 index 0000000000..2758d51d22 --- /dev/null +++ b/spec/views/api/v2/_standard_response.json_jbuilder_spec.rb @@ -0,0 +1,184 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/_standard_response.json.jbuilder' do + before do + @application = Faker::Lorem.word + # @caller = Faker::Lorem.word + @url = Faker::Internet.url + @code = 200 + + assign :application, @application + # assign :caller, @caller + + @response = OpenStruct.new(status: @code) + @request = Net::HTTPGenericRequest.new('GET', nil, nil, @url) + end + + describe 'standard response items - Also the same as: GET /heartbeat' do + before do + render partial: 'api/v2/standard_response', + locals: { response: @response, request: @request } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes the :code' do + expect(@json[:code]).to eql(@code) + end + + it 'includes the :message' do + expect(@json[:message]).to eql(Rack::Utils::HTTP_STATUS_CODES[@code]) + end + + it 'includes the :time' do + expect(@json[:time].present?).to be(true) + end + + it ':time is in UTC format' do + expect(Date.parse(@json[:time]).is_a?(Date)).to be(true) + end + + # it 'includes the :caller' do + # expect(@json[:caller]).to eql(@caller) + # end + + it 'includes the :source' do + expect(@json[:source].include?(@url)).to be(true) + end + + it 'includes the :total_items' do + expect(@json[:total_items]).to be(0) + end + end + + context 'responses with pagination' do + describe 'On the 1st page and there is only one page' do + before do + assign :page, 1 + assign :per_page, 3 + + render partial: 'api/v2/standard_response', + locals: { response: @response, request: @request, + total_items: 3 } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'shows the correct page number' do + expect(@json[:page]).to be(1) + end + + it 'includes the per_page number' do + expect(@json[:per_page]).to be(3) + end + + it 'includes the :total_items' do + expect(@json[:total_items]).to be(3) + end + + it "does not show a 'prev' page link" do + expect(@json[:prev].present?).to be(false) + end + + it "does not show a 'next' page link" do + expect(@json[:prev].present?).to be(false) + end + end + + describe 'On the 1st page and there multiple pages' do + before do + assign :page, 1 + assign :per_page, 3 + + render partial: 'api/v2/standard_response', + locals: { response: @response, request: @request, + total_items: 4 } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'shows the correct page number' do + expect(@json[:page]).to be(1) + end + + it 'includes the per_page number' do + expect(@json[:per_page]).to be(3) + end + + it 'includes the :total_items' do + expect(@json[:total_items]).to be(4) + end + + it "does not show a 'prev' page link" do + expect(@json[:prev].present?).to be(false) + end + + it "does not show a 'next' page link" do + expect(@json[:next].present?).to be(true) + end + end + + describe 'On the 2nd page and there more than 2 pages' do + before do + assign :page, 2 + assign :per_page, 3 + + render partial: 'api/v2/standard_response', + locals: { response: @response, request: @request, + total_items: 7 } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'shows the correct page number' do + expect(@json[:page]).to be(2) + end + + it 'includes the per_page number' do + expect(@json[:per_page]).to be(3) + end + + it 'includes the :total_items' do + expect(@json[:total_items]).to be(7) + end + + it "does not show a 'prev' page link" do + expect(@json[:prev].present?).to be(true) + end + + it "does not show a 'next' page link" do + expect(@json[:next].present?).to be(true) + end + end + + describe 'On the last page' do + before do + assign :page, 2 + assign :per_page, 3 + + render partial: 'api/v2/standard_response', + locals: { response: @response, request: @request, + total_items: 5 } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'shows the correct page number' do + expect(@json[:page]).to be(2) + end + + it 'includes the per_page number' do + expect(@json[:per_page]).to be(3) + end + + it 'includes the :total_items' do + expect(@json[:total_items]).to be(5) + end + + it "does not show a 'prev' page link" do + expect(@json[:prev].present?).to be(true) + end + + it "does not show a 'next' page link" do + expect(@json[:next].present?).to be(false) + end + end + end +end diff --git a/spec/views/api/v2/contributors/_show.json.jbuilder_spec.rb b/spec/views/api/v2/contributors/_show.json.jbuilder_spec.rb new file mode 100644 index 0000000000..c2652decaf --- /dev/null +++ b/spec/views/api/v2/contributors/_show.json.jbuilder_spec.rb @@ -0,0 +1,90 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/contributors/_show.json.jbuilder' do + before do + @plan = create(:plan) + scheme = create(:identifier_scheme, name: 'orcid') + @contact = create(:contributor, org: create(:org), plan: @plan, roles_count: 0, + data_curation: true) + @ident = create(:identifier, identifiable: @contact, value: Faker::Lorem.word, + identifier_scheme: scheme) + @contact.reload + end + + describe 'includes all of the Contributor attributes' do + before do + render partial: 'api/v2/contributors/show', locals: { contributor: @contact } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes the :name' do + expect(@json[:name]).to eql(@contact.name) + end + + it 'includes the :mbox' do + expect(@json[:mbox]).to eql(@contact.email) + end + + it 'includes the :role' do + expect(@json[:role].first.ends_with?('data-curation')).to be(true) + end + + it 'includes :affiliation' do + expect(@json[:affiliation][:name]).to eql(@contact.org.name) + end + + it 'includes :contributor_id' do + expect(@json[:contributor_id][:type]).to eql(@ident.identifier_format) + expect(@json[:contributor_id][:identifier]).to eql(@ident.value) + end + + it 'ignores non-orcid identifiers :contributor_id' do + scheme = create(:identifier_scheme, name: 'shibboleth') + create(:identifier, value: Faker::Lorem.word, identifiable: @contact, + identifier_scheme: scheme) + @contact.reload + expect(@json[:contributor_id][:type]).to eql(@ident.identifier_format) + expect(@json[:contributor_id][:identifier]).to eql(@ident.value) + end + end + + describe 'includes all of the Contact attributes' do + before do + render partial: 'api/v2/contributors/show', locals: { contributor: @contact, + is_contact: true } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes the :name' do + expect(@json[:name]).to eql(@contact.name) + end + + it 'includes the :mbox' do + expect(@json[:mbox]).to eql(@contact.email) + end + + it 'does NOT include the :role' do + expect(@json[:role]).to be_nil + end + + it 'includes :affiliation' do + expect(@json[:affiliation][:name]).to eql(@contact.org.name) + end + + it 'includes :contact_id' do + expect(@json[:contact_id][:type]).to eql(@ident.identifier_format) + expect(@json[:contact_id][:identifier]).to eql(@ident.value) + end + + it 'ignores non-orcid identifiers :contact_id' do + scheme = create(:identifier_scheme, name: 'shibboleth') + create(:identifier, value: Faker::Lorem.word, identifiable: @contact, + identifier_scheme: scheme) + @contact.reload + expect(@json[:contact_id][:type]).to eql(@ident.identifier_format) + expect(@json[:contact_id][:identifier]).to eql(@ident.value) + end + end +end diff --git a/spec/views/api/v2/datasets/_show.json.jbuilder_spec.rb b/spec/views/api/v2/datasets/_show.json.jbuilder_spec.rb new file mode 100644 index 0000000000..fc1b7d4e7b --- /dev/null +++ b/spec/views/api/v2/datasets/_show.json.jbuilder_spec.rb @@ -0,0 +1,196 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/datasets/_show.json.jbuilder' do + context ':output is a ResearchOutput' do + describe 'includes all of the dataset attributes' do + before do + @research_output = create(:research_output, plan: create(:plan)) + @presenter = Api::V2::ResearchOutputPresenter.new(output: @research_output) + end + + describe 'base :dataset attributes' do + before do + render partial: 'api/v2/datasets/show', locals: { output: @research_output } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes :type' do + expect(@json[:type]).to eql(@research_output.output_type) + end + + it 'includes :title' do + expect(@json[:title]).to eql(@research_output.title) + end + + it 'includes :description' do + expect(@json[:description]).to eql(@research_output.description) + end + + it 'includes :personal_data' do + val = Api::V2::ApiPresenter.boolean_to_yes_no_unknown(value: @research_output.personal_data) + expect(@json[:personal_data]).to eql(val) + end + + it 'includes :sensitive_data' do + val = Api::V2::ApiPresenter.boolean_to_yes_no_unknown(value: @research_output.sensitive_data) + expect(@json[:sensitive_data]).to eql(val) + end + + it 'includes :issued' do + expect(@json[:issued]).to eql(@research_output.release_date.to_formatted_s(:iso8601)) + end + + it 'includes :preservation_statement' do + expect(@json[:preservation_statement]).to eql(@presenter.preservation_statement) + end + + it 'includes :security_and_privacy' do + expect(@json[:security_and_privacy]).to eql(@presenter.security_and_privacy) + end + + it 'includes :data_quality_assurance' do + expect(@json[:data_quality_assurance]).to eql(@presenter.data_quality_assurance) + end + end + + describe ':distribution' do + before do + @repo = @research_output.repositories.first + @license = create(:license) + @research_output.license_id = @license.id + + render partial: 'api/v2/datasets/show', locals: { output: @research_output } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes :distributions' do + expect(@json[:distribution].any?).to be(true) + end + + it 'includes :title' do + expected = "Anticipated distribution for #{@research_output.title}" + expect(@json[:distribution].first[:title]).to eql(expected) + end + + it 'includes :byte_size' do + expect(@json[:distribution].first[:byte_size]).to eql(@research_output.byte_size) + end + + it 'includes :data_access' do + expect(@json[:distribution].first[:data_access]).to eql(@research_output.access) + end + + it 'includes host[:title]' do + expect(@json[:distribution].first[:host][:title]).to eql(@repo.name) + end + + it 'includes host[:description]' do + expect(@json[:distribution].first[:host][:description]).to eql(@repo.description) + end + + it 'includes host[:url]' do + expect(@json[:distribution].first[:host][:url]).to eql(@repo.homepage) + end + + it 'includes host[:dmproadmap_host_id]' do + result = @json[:distribution].first[:host][:dmproadmap_host_id][:identifier] + expect(result).to eql(@repo.uri) + end + + it 'includes license[:license_ref]' do + expect(@json[:distribution].first[:license].first[:license_ref]).to eql(@license.uri) + end + + it 'includes license[:start_date]' do + expected = @research_output.release_date.to_formatted_s(:iso8601) + expect(@json[:distribution].first[:license].first[:start_date]).to eql(expected) + end + end + + describe ':metadata' do + before do + @standard = create(:metadata_standard) + @research_output.metadata_standards << @standard + + render partial: 'api/v2/datasets/show', locals: { output: @research_output } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes :metadata' do + expect(@json[:metadata].any?).to be(true) + end + + it 'includes :description' do + uri = @standard.uri + metadata = @json[:metadata].select { |ms| ms[:metadata_standard_id][:identifier] == uri } + expected = "#{@standard.title} - #{@standard.description}" + expect(metadata.first[:description].start_with?(expected)).to be(true) + expect(metadata.first[:metadata_standard_id].present?).to be(true) + expect(metadata.first[:metadata_standard_id][:type]).to eql('url') + expect(metadata.first[:metadata_standard_id][:identifier]).to eql(uri) + end + end + + describe ':technical_resources' do + it 'is always an empty array because this has not been implemented' do + render partial: 'api/v2/datasets/show', locals: { output: @research_output } + @json = JSON.parse(rendered).with_indifferent_access + expect(@json[:technical_resource].any?).to be(false) + end + end + + describe ':keyword' do + it 'includes the ResearchDomain' do + research_domain = create(:research_domain) + @research_output.plan.research_domain_id = research_domain.id + render partial: 'api/v2/datasets/show', locals: { output: @research_output } + @json = JSON.parse(rendered).with_indifferent_access + expect(@json[:keyword].any?).to be(true) + expect(@json[:keyword].include?(research_domain.label)) + expect(@json[:keyword].include?("#{research_domain.identifier} - #{research_domain.label}")) + end + + it 'is not included if no ResearchDomain is defined' do + render partial: 'api/v2/datasets/show', locals: { output: @research_output } + @json = JSON.parse(rendered).with_indifferent_access + expect(@json[:keyword].present?).to be(false) + end + end + end + end + + context ':output is a Plan' do + describe 'includes all of the dataset attributes' do + before do + @plan = create(:plan) + @research_domain = create(:research_domain) + @plan.research_domain_id = @research_domain.id + + render partial: 'api/v2/datasets/show', locals: { output: @plan } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes :type' do + expect(@json[:type]).to eql('dataset') + end + + it 'includes :title' do + expect(@json[:title]).to eql('Generic dataset') + end + + it 'includes :description' do + expect(@json[:description]).to eql('No individual datasets have been defined for this DMP.') + end + + describe ':keyword' do + it 'includes the ResearchDomain' do + expect(@json[:keyword].any?).to be(true) + expect(@json[:keyword].include?(@research_domain.label)) + expect(@json[:keyword].include?("#{@research_domain.identifier} - #{@research_domain.label}")) + end + end + end + end +end diff --git a/spec/views/api/v2/error.json.jbuilder_spec.rb b/spec/views/api/v2/error.json.jbuilder_spec.rb new file mode 100644 index 0000000000..9732637ab7 --- /dev/null +++ b/spec/views/api/v2/error.json.jbuilder_spec.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/error.json.jbuilder' do + before do + @url = Faker::Internet.url + @code = [200, 400, 404, 500].sample + @errors = [Faker::Lorem.sentence, Faker::Lorem.sentence] + + assign :payload, { errors: @errors } + + @resp = OpenStruct.new(status: @code) + @req = Net::HTTPGenericRequest.new('GET', nil, nil, @url) + + render template: 'api/v2/error', locals: { response: @resp, request: @req } + @json = JSON.parse(rendered).with_indifferent_access + end + + describe 'error responses from controllers' do + it 'renders the standard_response partial' do + expect(response).to render_template(partial: 'api/v2/_standard_response') + end + + it ':errors contains an array of error messages' do + expect(@json[:errors]).to eql(@errors) + end + end +end diff --git a/spec/views/api/v2/heartbeat.json.jbuilder_spec.rb b/spec/views/api/v2/heartbeat.json.jbuilder_spec.rb new file mode 100644 index 0000000000..1808117b19 --- /dev/null +++ b/spec/views/api/v2/heartbeat.json.jbuilder_spec.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/heartbeat.json.jbuilder' do + before do + render template: 'api/v2/heartbeat', locals: { response: @resp, request: @req } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'renders the _standard_response template' do + expect(response).to render_template('api/v2/_standard_response') + end + + it ':items array to be empty' do + expect(@json[:items]).to eql([]) + end +end diff --git a/spec/views/api/v2/identifiers/_show.json.jbuilder_spec.rb b/spec/views/api/v2/identifiers/_show.json.jbuilder_spec.rb new file mode 100644 index 0000000000..602169fd75 --- /dev/null +++ b/spec/views/api/v2/identifiers/_show.json.jbuilder_spec.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/identifiers/_show.json.jbuilder' do + before do + @scheme = create(:identifier_scheme) + @identifier = create(:identifier, value: Faker::Lorem.word, + identifier_scheme: @scheme) + render partial: 'api/v2/identifiers/show', locals: { identifier: @identifier } + @json = JSON.parse(rendered).with_indifferent_access + end + + describe 'includes all of the identifier attributes' do + it 'includes :type' do + expect(@json[:type]).to eql(@identifier.identifier_format) + end + + it 'includes :identifier' do + expect(@json[:identifier]).to eql(@identifier.value) + end + end +end diff --git a/spec/views/api/v2/orgs/_show.json.jbuilder_spec.rb b/spec/views/api/v2/orgs/_show.json.jbuilder_spec.rb new file mode 100644 index 0000000000..5480ae0ee1 --- /dev/null +++ b/spec/views/api/v2/orgs/_show.json.jbuilder_spec.rb @@ -0,0 +1,43 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/orgs/_show.json.jbuilder' do + before do + scheme = create(:identifier_scheme, name: 'ror') + @org = create(:org) + @ident = create(:identifier, value: Faker::Lorem.word, identifiable: @org, + identifier_scheme: scheme) + @org.reload + render partial: 'api/v2/orgs/show', locals: { org: @org } + @json = JSON.parse(rendered).with_indifferent_access + end + + describe 'includes all of the org attributes' do + it 'includes :name' do + expect(@json[:name]).to eql(@org.name) + end + + it 'includes :abbreviation' do + expect(@json[:abbreviation]).to eql(@org.abbreviation) + end + + it 'includes :region' do + expect(@json[:region]).to eql(@org.region.abbreviation) + end + + it 'includes :affiliation_id' do + expect(@json[:affiliation_id][:type]).to eql(@ident.identifier_format) + expect(@json[:affiliation_id][:identifier]).to eql(@ident.value) + end + + it 'uses the ROR over the FundRef :affiliation_id' do + scheme = create(:identifier_scheme, name: 'fundref') + create(:identifier, value: Faker::Lorem.word, identifiable: @org, + identifier_scheme: scheme) + @org.reload + expect(@json[:affiliation_id][:type]).to eql(@ident.identifier_format) + expect(@json[:affiliation_id][:identifier]).to eql(@ident.value) + end + end +end diff --git a/spec/views/api/v2/plans/_cost.json.jbuilder_spec.rb b/spec/views/api/v2/plans/_cost.json.jbuilder_spec.rb new file mode 100644 index 0000000000..712e9300e9 --- /dev/null +++ b/spec/views/api/v2/plans/_cost.json.jbuilder_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/plans/_cost.json.jbuilder' do + before do + # TODO: Implement this once the Currency question and Cost theme are in place + # and the PlanPresenter is extracting the info + @cost = { + title: Faker::Lorem.sentence, + description: Faker::Lorem.paragraph, + currency_code: Faker::Currency.code, + value: Faker::Number.decimal(l_digits: 2) + }.with_indifferent_access + + render partial: 'api/v2/plans/cost', locals: { cost: @cost } + @json = JSON.parse(rendered).with_indifferent_access + end + + describe 'includes all of the cost attributes' do + it 'includes :title' do + expect(@json[:title]).to eql(@cost[:title]) + end + + it 'includes :description' do + expect(@json[:description]).to eql(@cost[:description]) + end + + it 'includes :currency_code' do + expect(@json[:currency_code]).to eql(@cost[:currency_code]) + end + + it 'includes :value' do + expect(@json[:value]).to eql(@cost[:value]) + end + end +end diff --git a/spec/views/api/v2/plans/_funding.json.jbuilder_spec.rb b/spec/views/api/v2/plans/_funding.json.jbuilder_spec.rb new file mode 100644 index 0000000000..c9fe9ea015 --- /dev/null +++ b/spec/views/api/v2/plans/_funding.json.jbuilder_spec.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/plans/_funding.json.jbuilder' do + before do + @funder = create(:org, :funder) + create(:identifier, identifiable: @funder, + identifier_scheme: create(:identifier_scheme, name: 'fundref')) + @funder.reload + @plan = create(:plan, funder: @funder, org: create(:org), identifier: SecureRandom.uuid) + create(:identifier, identifiable: @plan.org, + identifier_scheme: create(:identifier_scheme, name: 'ror')) + @grant = create(:identifier, identifiable: @plan) + @plan.update(grant_id: @grant.id, funding_status: 'funded') + @plan.reload + + render partial: 'api/v2/plans/funding', locals: { plan: @plan } + @json = JSON.parse(rendered).with_indifferent_access + end + + describe 'includes all of the funding attributes' do + it 'includes :name' do + expect(@json[:name]).to eql(@funder.name) + end + + it 'includes :funding_status' do + expected = Api::V2::FundingPresenter.status(plan: @plan) + expect(@json[:funding_status]).to eql(expected) + end + + it 'includes :funder_ids' do + id = @funder.identifiers.first + expect(@json[:funder_id][:type]).to eql(id.identifier_format) + expect(@json[:funder_id][:identifier]).to eql(id.value) + end + + it 'includes :dmproadmap_funding_opportunity_identifier' do + identifier = @plan.identifier + expect(@json[:dmproadmap_funding_opportunity_id][:type]).to eql('other') + expect(@json[:dmproadmap_funding_opportunity_id][:identifier]).to eql(identifier) + end + + it 'includes :grant_ids' do + expect(@json[:grant_id][:type]).to eql(@grant.identifier_format) + expect(@json[:grant_id][:identifier]).to eql(@grant.value) + end + + it 'includes :dmproadmap_funded_affiliations' do + org = @plan.org + expect(@json[:dmproadmap_funded_affiliations].any?).to be(true) + affil = @json[:dmproadmap_funded_affiliations].last + expect(affil[:name]).to eql(org.name) + expect(affil[:affiliation_id][:type]).to eql(org.identifiers.last.identifier_format) + expect(affil[:affiliation_id][:identifier]).to eql(org.identifiers.last.value) + end + end +end diff --git a/spec/views/api/v2/plans/_project.json.jbuilder_spec.rb b/spec/views/api/v2/plans/_project.json.jbuilder_spec.rb new file mode 100644 index 0000000000..53af088379 --- /dev/null +++ b/spec/views/api/v2/plans/_project.json.jbuilder_spec.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/plans/_project.json.jbuilder' do + before do + @plan = build(:plan, funder: build(:org, :funder)) + render partial: 'api/v2/plans/project', locals: { plan: @plan } + @json = JSON.parse(rendered).with_indifferent_access + end + + describe 'includes all of the project attributes' do + it 'includes :title' do + expect(@json[:title]).to eql(@plan.title) + end + + it 'includes :description' do + expect(@json[:description]).to eql(@plan.description) + end + + it 'includes :start' do + expect(@json[:start]).to eql(@plan.start_date.to_formatted_s(:iso8601)) + end + + it 'includes :end' do + expect(@json[:end]).to eql(@plan.end_date.to_formatted_s(:iso8601)) + end + + it 'includes the :funder' do + expect(@json[:funding].length).to be(1) + end + end +end diff --git a/spec/views/api/v2/plans/_show.json.jbuilder_spec.rb b/spec/views/api/v2/plans/_show.json.jbuilder_spec.rb new file mode 100644 index 0000000000..c706ca3bb6 --- /dev/null +++ b/spec/views/api/v2/plans/_show.json.jbuilder_spec.rb @@ -0,0 +1,115 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/plans/_show.json.jbuilder' do + before do + Rails.configuration.x.madmp.enable_dmp_id_registration = true + + @plan = create(:plan) + @data_contact = create(:contributor, data_curation: true, plan: @plan) + @pi = create(:contributor, investigation: true, plan: @plan) + @plan.contributors = [@data_contact, @pi] + create(:identifier, identifiable: @plan) + + # Create an Api Client and connect it to the Plan + @client = create(:api_client) + scheme = create(:identifier_scheme, :for_plans, name: @client.name.downcase) + @client_identifier = create(:identifier, identifier_scheme: scheme, identifiable: @plan) + + @plan.save + @plan.reload + @presenter = Api::V2::PlanPresenter.new(plan: @plan) + end + + describe 'includes all of the DMP attributes' do + before do + render partial: 'api/v2/plans/show', locals: { client: @client, plan: @plan } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'includes the :title' do + expect(@json[:title]).to eql(@plan.title) + end + + it 'includes the :description' do + expect(@json[:description]).to eql(@plan.description) + end + + it 'includes the :language' do + # Set @plan.owner + @plan.roles << create(:role, :creator, user: create(:user)) + expected = Api::V2::LanguagePresenter.three_char_code( + lang: @plan.owner&.language&.abbreviation + ) + expect(@json[:language]).to eql(expected) + end + + it 'includes the :created' do + expect(@json[:created]).to eql(@plan.created_at.to_formatted_s(:iso8601)) + end + + it 'includes the :modified' do + expect(@json[:modified]).to eql(@plan.updated_at.to_formatted_s(:iso8601)) + end + + it 'includes :ethical_issues' do + expected = Api::V2::ConversionService.boolean_to_yes_no_unknown(@plan.ethical_issues) + expect(@json[:ethical_issues_exist]).to eql(expected) + end + + it 'includes :ethical_issues_description' do + expect(@json[:ethical_issues_description]).to eql(@plan.ethical_issues_description) + end + + it 'includes :ethical_issues_report' do + expect(@json[:ethical_issues_report]).to eql(@plan.ethical_issues_report) + end + + it 'returns the URL of the plan as the :dmp_id if no DMP ID is defined' do + expected = Rails.application.routes.url_helpers.api_v2_plan_url(@plan) + expect(@json[:dmp_id][:type]).to eql('url') + expect(@json[:dmp_id][:identifier]).to eql(expected) + end + + it 'includes the :contact' do + expect(@json[:contact][:mbox]).to eql(@data_contact.email) + end + + it 'includes the :contributors' do + emails = @json[:contributor].pluck(:mbox) + expect(emails.include?(@pi.email)).to be(true) + end + + # TODO: make sure this is working once the new Cost theme and Currency + # question type have been implemented + it 'includes the :cost' do + expect(@json[:cost]).to be_nil + end + + it 'includes the :project' do + expect(@json[:project].length).to be(1) + end + + it 'includes the :dataset' do + expect(@json[:dataset].length).to be(1) + end + end + + describe 'when the system mints DMP IDs', skip: 'DmpIdService not implemented' do + before do + scheme = create(:identifier_scheme) + DmpIdService.expects(:identifier_scheme).at_least(1).returns(scheme) + @doi = create(:identifier, value: '10.9999/123abc.zy/x23', identifiable: @plan, + identifier_scheme: scheme) + @plan.reload + render partial: 'api/v2/plans/show', locals: { client: @client, plan: @plan } + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'returns the DMP ID for the :dmp_id if one is present' do + expect(@json[:dmp_id][:type]).to eql('doi') + expect(@json[:dmp_id][:identifier]).to eql(@doi.value) + end + end +end diff --git a/spec/views/api/v2/plans/index.json.jbuilder_spec.rb b/spec/views/api/v2/plans/index.json.jbuilder_spec.rb new file mode 100644 index 0000000000..5d47770c52 --- /dev/null +++ b/spec/views/api/v2/plans/index.json.jbuilder_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/plans/index.json.jbuilder' do + before do + @plan = create(:plan) + + @client = create(:api_client) + @items = [@plan] + @total_items = 1 + + render template: 'api/v2/plans/index' + @json = JSON.parse(rendered).with_indifferent_access + end + + it 'renders the _standard_response template' do + expect(response).to render_template('api/v2/_standard_response') + end + + it ':items array to be empty' do + expect(@json[:items].length).to be(1) + expect(@json[:items].first[:dmp][:title]).to eql(@plan.title) + end +end diff --git a/spec/views/api/v2/templates/index.json.jbuilder_spec.rb b/spec/views/api/v2/templates/index.json.jbuilder_spec.rb new file mode 100644 index 0000000000..99b35375ec --- /dev/null +++ b/spec/views/api/v2/templates/index.json.jbuilder_spec.rb @@ -0,0 +1,78 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api/v2/templates/index.json.jbuilder' do + before do + @application = Faker::Lorem.word + @url = Faker::Internet.url + @code = [200, 400, 404, 500].sample + + @template1 = create(:template, :published, org: create(:org), phases: 1) + @template2 = create(:template, :published) + + assign :server, @application + assign :items, [@template1, @template2] + + @resp = OpenStruct.new(status: @code) + @req = Net::HTTPGenericRequest.new('GET', nil, nil, @url) + end + + describe 'includes all of the Template attributes' do + before do + render template: 'api/v2/templates/index', + locals: { response: @resp, request: @req } + @json = JSON.parse(rendered).with_indifferent_access + + @template = @json[:items].first[:dmp_template] + end + + it 'includes both templates' do + expect(@json[:items].length).to be(2) + end + + it 'includes the :title' do + expect(@template[:title]).to eql(@template1.title) + end + + it 'includes the :description' do + expect(@template[:description]).to eql(@template1.description) + end + + it 'includes the :version' do + expect(@template[:version]).to eql(@template1.version) + end + + it 'includes the :created' do + expect(@template[:created]).to eql(@template1.created_at.to_formatted_s(:iso8601)) + end + + it 'includes the :modified' do + expect(@template[:modified]).to eql(@template1.updated_at.to_formatted_s(:iso8601)) + end + + it 'includes the :affiliation' do + expect(@template[:affiliation][:name]).to eql(@template1.org.name) + end + + it 'includes the :template_ids' do + expect(@template[:template_id][:identifier]).to eql(@template1.id.to_s) + expect(@template[:template_id][:type]).to eql('other') + end + + # The show_url parameter is either false or not included + it 'includes the :phases' do + expect(@json[:items].first[:dmp_template][:phases]).to be_nil + end + end + + # The show_url parameter is true + describe 'when the show_phases url parameter is true' do + before do + @show_phases = true + render template: 'api/v2/templates/index', + locals: { response: @resp, request: @req, show_phases: @show_phases } + @json = JSON.parse(rendered).with_indifferent_access + end + end +end diff --git a/yarn.lock b/yarn.lock index 9f5646f477..cc09279ced 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,251 +2,256 @@ # yarn lockfile v1 -"@ampproject/remapping@^2.2.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" - integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.5" - "@jridgewell/trace-mapping" "^0.3.24" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.26.2": - version "7.26.2" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" - integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.7.tgz#f2fbbfea87c44a21590ec515b778b2c26d8866e7" + integrity sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw== dependencies: - "@babel/helper-validator-identifier" "^7.25.9" + "@babel/helper-validator-identifier" "^7.29.7" js-tokens "^4.0.0" - picocolors "^1.0.0" + picocolors "^1.1.1" -"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.26.5", "@babel/compat-data@^7.26.8": - version "7.26.8" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.8.tgz#821c1d35641c355284d4a870b8a4a7b0c141e367" - integrity sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ== +"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.28.6", "@babel/compat-data@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.7.tgz#6f0237f0f36d2e51c0570a636faed9d2d0efe629" + integrity sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg== "@babel/core@^7.20.12": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.10.tgz#5c876f83c8c4dcb233ee4b670c0606f2ac3000f9" - integrity sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.26.2" - "@babel/generator" "^7.26.10" - "@babel/helper-compilation-targets" "^7.26.5" - "@babel/helper-module-transforms" "^7.26.0" - "@babel/helpers" "^7.26.10" - "@babel/parser" "^7.26.10" - "@babel/template" "^7.26.9" - "@babel/traverse" "^7.26.10" - "@babel/types" "^7.26.10" + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.7.tgz#80c10b17248082968b57a857b91640971f2070f7" + integrity sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA== + dependencies: + "@babel/code-frame" "^7.29.7" + "@babel/generator" "^7.29.7" + "@babel/helper-compilation-targets" "^7.29.7" + "@babel/helper-module-transforms" "^7.29.7" + "@babel/helpers" "^7.29.7" + "@babel/parser" "^7.29.7" + "@babel/template" "^7.29.7" + "@babel/traverse" "^7.29.7" + "@babel/types" "^7.29.7" + "@jridgewell/remapping" "^2.3.5" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.26.10": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.10.tgz#a60d9de49caca16744e6340c3658dfef6138c3f7" - integrity sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang== +"@babel/generator@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.7.tgz#cca0b8827e6bcf3ba176788e7f3b180ad6db2fa3" + integrity sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ== dependencies: - "@babel/parser" "^7.26.10" - "@babel/types" "^7.26.10" - "@jridgewell/gen-mapping" "^0.3.5" - "@jridgewell/trace-mapping" "^0.3.25" + "@babel/parser" "^7.29.7" + "@babel/types" "^7.29.7" + "@jridgewell/gen-mapping" "^0.3.12" + "@jridgewell/trace-mapping" "^0.3.28" jsesc "^3.0.2" -"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4" - integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g== +"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.29.7.tgz#c70fe3c6ecbdc3fd2dd1b0f498428b88b82ce47f" + integrity sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw== dependencies: - "@babel/types" "^7.25.9" + "@babel/types" "^7.29.7" -"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9", "@babel/helper-compilation-targets@^7.26.5": - version "7.26.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz#75d92bb8d8d51301c0d49e52a65c9a7fe94514d8" - integrity sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA== +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.28.6", "@babel/helper-compilation-targets@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz#7a1def704302401c47f64fa85589e974ae217042" + integrity sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g== dependencies: - "@babel/compat-data" "^7.26.5" - "@babel/helper-validator-option" "^7.25.9" + "@babel/compat-data" "^7.29.7" + "@babel/helper-validator-option" "^7.29.7" browserslist "^4.24.0" lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.25.9": - version "7.26.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz#d6f83e3039547fbb39967e78043cd3c8b7820c71" - integrity sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.25.9" - "@babel/helper-member-expression-to-functions" "^7.25.9" - "@babel/helper-optimise-call-expression" "^7.25.9" - "@babel/helper-replace-supers" "^7.26.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" - "@babel/traverse" "^7.26.9" +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.7.tgz#6eddf286f2ec418f740c91d60a83347c55838ddd" + integrity sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.29.7" + "@babel/helper-member-expression-to-functions" "^7.29.7" + "@babel/helper-optimise-call-expression" "^7.29.7" + "@babel/helper-replace-supers" "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7" + "@babel/traverse" "^7.29.7" semver "^6.3.1" -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.25.9": - version "7.26.3" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz#5169756ecbe1d95f7866b90bb555b022595302a0" - integrity sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.29.7.tgz#5d4c3f928f315cf6c4184ea2fc3b5b38745b2430" + integrity sha512-907Uymvqgg1dwUA+7IGwFAOSYzQOuzPXKNJ1yxzwPffzkYFg2q2eHi1fIOs6sXkG9NbIUMunnUlkYsfRFNvomg== dependencies: - "@babel/helper-annotate-as-pure" "^7.25.9" - regexpu-core "^6.2.0" + "@babel/helper-annotate-as-pure" "^7.29.7" + regexpu-core "^6.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.3": - version "0.6.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz#f4f2792fae2ef382074bc2d713522cf24e6ddb21" - integrity sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg== +"@babel/helper-define-polyfill-provider@^0.6.5", "@babel/helper-define-polyfill-provider@^0.6.8": + version "0.6.8" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.8.tgz#cf1e4462b613f2b54c41e6ff758d5dfcaa2c85d1" + integrity sha512-47UwBLPpQi1NoWzLuHNjRoHlYXMwIJoBf7MFou6viC/sIHWYygpvr0B6IAyh5sBdA2nr2LPIRww8lfaUVQINBA== dependencies: - "@babel/helper-compilation-targets" "^7.22.6" - "@babel/helper-plugin-utils" "^7.22.5" - debug "^4.1.1" + "@babel/helper-compilation-targets" "^7.28.6" + "@babel/helper-plugin-utils" "^7.28.6" + debug "^4.4.3" lodash.debounce "^4.0.8" - resolve "^1.14.2" - -"@babel/helper-member-expression-to-functions@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3" - integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ== - dependencies: - "@babel/traverse" "^7.25.9" - "@babel/types" "^7.25.9" - -"@babel/helper-module-imports@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715" - integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw== - dependencies: - "@babel/traverse" "^7.25.9" - "@babel/types" "^7.25.9" - -"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0": - version "7.26.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae" - integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw== - dependencies: - "@babel/helper-module-imports" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" - "@babel/traverse" "^7.25.9" + resolve "^1.22.11" + +"@babel/helper-globals@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.29.7.tgz#f04a96fbd8473241b1079243f5b3f03a3010ab7b" + integrity sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA== + +"@babel/helper-member-expression-to-functions@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.29.7.tgz#8dbdb3ce0b5c487e1aec10e13c9a43a500814df8" + integrity sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg== + dependencies: + "@babel/traverse" "^7.29.7" + "@babel/types" "^7.29.7" + +"@babel/helper-module-imports@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz#ef25048a518e828d7393fac5882ddd73921d7396" + integrity sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g== + dependencies: + "@babel/traverse" "^7.29.7" + "@babel/types" "^7.29.7" + +"@babel/helper-module-transforms@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz#b062747a5997ba138637201328bbff77960574ae" + integrity sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg== + dependencies: + "@babel/helper-module-imports" "^7.29.7" + "@babel/helper-validator-identifier" "^7.29.7" + "@babel/traverse" "^7.29.7" + +"@babel/helper-optimise-call-expression@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.29.7.tgz#77b0b5b94f1997fa9d6e3125f445227b1faf9d85" + integrity sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong== + dependencies: + "@babel/types" "^7.29.7" -"@babel/helper-optimise-call-expression@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e" - integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ== - dependencies: - "@babel/types" "^7.25.9" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.26.5", "@babel/helper-plugin-utils@^7.8.0": - version "7.26.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35" - integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg== - -"@babel/helper-remap-async-to-generator@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92" - integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.25.9" - "@babel/helper-wrap-function" "^7.25.9" - "@babel/traverse" "^7.25.9" +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.28.6", "@babel/helper-plugin-utils@^7.29.7", "@babel/helper-plugin-utils@^7.8.0": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz#c0a0766f1a13617d8a17407d7ab8f9d486225ea4" + integrity sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw== + +"@babel/helper-remap-async-to-generator@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.29.7.tgz#34b1f68dd75b86d31df781a29c3ff2df88da82e6" + integrity sha512-16AMiW26DbXWBbr3B8wNozKM0ydMLB892vaOaJW/fPJdnT8vJk5sdkQcU/isqUxyCE0cEoa8wZOcbgDuC4b6Og== + dependencies: + "@babel/helper-annotate-as-pure" "^7.29.7" + "@babel/helper-wrap-function" "^7.29.7" + "@babel/traverse" "^7.29.7" + +"@babel/helper-replace-supers@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.29.7.tgz#bc3c3964329043c79112e513c1b198f16589ac21" + integrity sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.29.7" + "@babel/helper-optimise-call-expression" "^7.29.7" + "@babel/traverse" "^7.29.7" + +"@babel/helper-skip-transparent-expression-wrappers@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.29.7.tgz#50c95c7e4c4f54936cfa0116428edc559862d551" + integrity sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ== + dependencies: + "@babel/traverse" "^7.29.7" + "@babel/types" "^7.29.7" + +"@babel/helper-string-parser@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz#7f0871d99824d23137d60f86fcf6130fd5a1b51f" + integrity sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw== + +"@babel/helper-validator-identifier@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz#bd87084ced0c796ec46bda492de6e83d29e89fc2" + integrity sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg== + +"@babel/helper-validator-option@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz#cf315be940213b354eb4abcc0bd01ebe3f73bc2a" + integrity sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw== + +"@babel/helper-wrap-function@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.29.7.tgz#eec72163044548a0935e9d182bf2d547ec5ff483" + integrity sha512-iES0Skag9ERIF68aXadpO6dbXa03mNWK3sEqJaMnLNs/eC3l0lkImdfoy6Y09/SfkpawdAB4RjQ7PVA7TcVGdw== + dependencies: + "@babel/template" "^7.29.7" + "@babel/traverse" "^7.29.7" + "@babel/types" "^7.29.7" + +"@babel/helpers@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.29.7.tgz#45abfde7548997e34376c3e69feb475cffb4a607" + integrity sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg== + dependencies: + "@babel/template" "^7.29.7" + "@babel/types" "^7.29.7" -"@babel/helper-replace-supers@^7.25.9", "@babel/helper-replace-supers@^7.26.5": - version "7.26.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz#6cb04e82ae291dae8e72335dfe438b0725f14c8d" - integrity sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg== +"@babel/parser@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.7.tgz#837b87387cbf5ec5530cb634b3c622f68edb9334" + integrity sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg== dependencies: - "@babel/helper-member-expression-to-functions" "^7.25.9" - "@babel/helper-optimise-call-expression" "^7.25.9" - "@babel/traverse" "^7.26.5" - -"@babel/helper-skip-transparent-expression-wrappers@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9" - integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA== + "@babel/types" "^7.29.7" + +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.29.7.tgz#2b535896d933a85aa92377eaa3d51a437d54a4e3" + integrity sha512-j8SrR0zLZrRsC09DlszEx8FpMiwukKffYXMK0d5LmOglO7vGG6sz/BR/20yHqWH+Lnn31JTt2PE3hIWNgM2J6w== dependencies: - "@babel/traverse" "^7.25.9" - "@babel/types" "^7.25.9" - -"@babel/helper-string-parser@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" - integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== - -"@babel/helper-validator-identifier@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" - integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== - -"@babel/helper-validator-option@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" - integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== - -"@babel/helper-wrap-function@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0" - integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g== + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/traverse" "^7.29.7" + +"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.29.7.tgz#b00711a9e52bf4fe55ef7e54b2ef4a881bf804c8" + integrity sha512-r8j8escF+U2FUHo0KOhPUdMzUO+jp9fInva6+ACVAF3Y97Ev+5iNZwiqTghmzNeWwDkOPlYuTcfb1vDaoZKmAQ== dependencies: - "@babel/template" "^7.25.9" - "@babel/traverse" "^7.25.9" - "@babel/types" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.29.7.tgz#2375328852026a3cf6bc0bcf2de7d236f2d5e701" + integrity sha512-GE1TFSiuFeGsCxmYXZl8HwoPrVlwe4rHPFE8weieGKZqnDORK+Ar3vgWMgW+AOxQ6/2TgLSKx9p6W7O4rC6qgQ== + dependencies: + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/helpers@^7.26.10": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.10.tgz#6baea3cd62ec2d0c1068778d63cb1314f6637384" - integrity sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g== +"@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.7.tgz#759a857c46c4d2a6199685cf71070d81ae5f743a" + integrity sha512-oBNVCvnO5tND+xSopWvV8WNGfpTfgP4Zr/YXXSj8zfmcPktp5Ku/aZlsIowgSD4fjmgHn6sGmB9APVsU5zOdhA== dependencies: - "@babel/template" "^7.26.9" - "@babel/types" "^7.26.10" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7" -"@babel/parser@^7.26.10", "@babel/parser@^7.26.9": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.10.tgz#e9bdb82f14b97df6569b0b038edd436839c57749" - integrity sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA== - dependencies: - "@babel/types" "^7.26.10" - -"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe" - integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g== - dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/traverse" "^7.25.9" - -"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30" - integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.29.7.tgz#86de98dd8e03836178231ea96c27dab26016a705" + integrity sha512-QQt9qKHZ2sg/kivaLr7lnQr8HVrQDdBNSfCsTjiDxRuX/K5ORyKq+Bu8Xr0cDE3Dfkv0cw28Ve0EKyKMvulkOw== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137" - integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug== - dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7" + "@babel/plugin-transform-optional-chaining" "^7.29.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1" - integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g== +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.29.7.tgz#f5d892681dbf4b08753436a5e55000d5ba728d6d" + integrity sha512-pn6QacGLgvCcwc+syUhKE/qSjV2D1IHDB84RNxWYSt1mW3K/SCtjinZ2p0cETJxAWBjPy3K/1lHwG5BjjPxNlw== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" - "@babel/plugin-transform-optional-chaining" "^7.25.9" - -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e" - integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg== - dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/traverse" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/traverse" "^7.29.7" "@babel/plugin-proposal-class-properties@^7.18.6": version "7.18.6" @@ -290,19 +295,19 @@ "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-syntax-import-assertions@^7.26.0": - version "7.26.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f" - integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg== +"@babel/plugin-syntax-import-assertions@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.29.7.tgz#c5cd868505269126cc18882e1f01f7b0e0e24b4e" + integrity sha512-/An1OCBN93thpBAGyfsK2pcf0jvju1SAtKkL2Ny++B5Sy6sqgzXDQH1cZxWbF96Wuk+bn41MDA9bLd4VVAw6rw== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-syntax-import-attributes@^7.26.0": - version "7.26.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7" - integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A== +"@babel/plugin-syntax-import-attributes@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.29.7.tgz#6115264516e95ead0f35a41710906612e447f605" + integrity sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" @@ -326,478 +331,490 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845" - integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg== +"@babel/plugin-transform-arrow-functions@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.29.7.tgz#d651343f562c03f47951bd1802195d0e10605f27" + integrity sha512-N7zArUXWzAMzm+/N0uPBeVB3Fam5lMxtUwMmDK5f/IBBS7a7p1qeUoxd/6CckXoxUdgsntq1Dh8xNW06maZbDQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-async-generator-functions@^7.26.8": - version "7.26.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz#5e3991135e3b9c6eaaf5eff56d1ae5a11df45ff8" - integrity sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg== +"@babel/plugin-transform-async-generator-functions@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.7.tgz#a5365617921d82a1fee33124a1102bb38a1e677d" + integrity sha512-d98gXZkgswvkyohMBABkhm3GeXhYj8psWfwQ2C7gtfrKGTykQa/iOIi+JJhwMjPlZ6Vm2XN+DCf3Es1EoG4ZLA== dependencies: - "@babel/helper-plugin-utils" "^7.26.5" - "@babel/helper-remap-async-to-generator" "^7.25.9" - "@babel/traverse" "^7.26.8" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-remap-async-to-generator" "^7.29.7" + "@babel/traverse" "^7.29.7" -"@babel/plugin-transform-async-to-generator@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71" - integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ== +"@babel/plugin-transform-async-to-generator@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.29.7.tgz#3b5e8f1fb58133cf701bcf0baaf6f01bfd1a8889" + integrity sha512-pcUb2SS+RMo9TWVBwKGI5ShtoG7R+zBsFmCKDa6fe8c+hPr3XJlZgoE5j6i8W7gDjhyvy+85vmYexanvXh3d1w== dependencies: - "@babel/helper-module-imports" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/helper-remap-async-to-generator" "^7.25.9" + "@babel/helper-module-imports" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-remap-async-to-generator" "^7.29.7" -"@babel/plugin-transform-block-scoped-functions@^7.26.5": - version "7.26.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz#3dc4405d31ad1cbe45293aa57205a6e3b009d53e" - integrity sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ== +"@babel/plugin-transform-block-scoped-functions@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.29.7.tgz#96d292634434082d6687bcdb81139affedf77e8c" + integrity sha512-cUSmjh72N+rN4PrkFlN1dJwNCwjVp5d38/CQrEsFggkD10UiFlBFgdH3tv5dNsLuHY+3S8db2xCHjhZcv5WgvA== dependencies: - "@babel/helper-plugin-utils" "^7.26.5" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-block-scoping@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1" - integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg== +"@babel/plugin-transform-block-scoping@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.7.tgz#baa376691ae16244cd14335422fca6900f54e17d" + integrity sha512-ONyr4+AZhKh8yKWInVxU9AXA9EbsyeLcL6V0dJy6M2/62vuvpGm29zzuymbTpdc451GEpDIdAyPLP3r+P61yKQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-class-properties@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f" - integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q== +"@babel/plugin-transform-class-properties@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.29.7.tgz#034897b8a21beec163332fac2de235b14409abdf" + integrity sha512-GtcpjFvanPfzNQi3eTitsCqtRRmmqzpy/A+yhTR1HaZo1Ly3EA8ZXxlPyHdR8/IuRMYc3E4wdGBewB2QKQjAaA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-class-static-block@^7.26.0": - version "7.26.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0" - integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ== +"@babel/plugin-transform-class-static-block@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.29.7.tgz#fed8efd19f3dd3e1114ee390707c70912778fd7c" + integrity sha512-kibJgmEdX2iMwsHY2tSZNDgj8PwIlCQz7FK9KuGKO8zsuoUwSEhoNnNVp/emKWrbY4HeO6kkXfdMqRKKKXBm2A== dependencies: - "@babel/helper-create-class-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-classes@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52" - integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg== +"@babel/plugin-transform-classes@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.29.7.tgz#61d3e5aaae0c838acc3204d9db7c8dc05c25815b" + integrity sha512-qV0OGGBVacduzQHE649JyCneOFI/maT+YKsO+K4Yi3xv2wTPNjM/W2o2gdzMwEAZz7fXNTHAe0NcSg30bIN69g== dependencies: - "@babel/helper-annotate-as-pure" "^7.25.9" - "@babel/helper-compilation-targets" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/helper-replace-supers" "^7.25.9" - "@babel/traverse" "^7.25.9" - globals "^11.1.0" + "@babel/helper-annotate-as-pure" "^7.29.7" + "@babel/helper-compilation-targets" "^7.29.7" + "@babel/helper-globals" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-replace-supers" "^7.29.7" + "@babel/traverse" "^7.29.7" -"@babel/plugin-transform-computed-properties@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b" - integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA== +"@babel/plugin-transform-computed-properties@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.29.7.tgz#95028787ca31901b9a20b5c6d9605c32346f55ad" + integrity sha512-RK7/IyU5phpuCdBAuig5VkzG/EnbDaui5SQGdU9BFrHdV+mV4cUjLMQ9lJDjLNtWHsqtiefpGZUXQP2BiTYMsA== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/template" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/template" "^7.29.7" -"@babel/plugin-transform-destructuring@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1" - integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ== +"@babel/plugin-transform-destructuring@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.29.7.tgz#5781ec6947852e27b64c1165f0db431f408090e4" + integrity sha512-iPX8aD6H9zV5s7ZsqTdNocPN/MGQ5sSMnElKrktxjJRMnB2jN/1p2+R7GkfD6CAYoVFqy5A4XnSIUeGgJzIWpg== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/traverse" "^7.29.7" -"@babel/plugin-transform-dotall-regex@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a" - integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA== +"@babel/plugin-transform-dotall-regex@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.29.7.tgz#b203de9740e4c7ff6b55ce436ed5313b88d70af8" + integrity sha512-3qc18hsD2RdZiyJNDNc7HQpv6xbncwh8FYtxNFFzclSyh/trPD9KkVR9BDECUjDLvb7yJVF15GfYUuC+LMkkiQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-regexp-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-duplicate-keys@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d" - integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw== +"@babel/plugin-transform-duplicate-keys@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.29.7.tgz#8f3fe721835cb7a433420841dae90afc962ea7ae" + integrity sha512-6IvRRriEMqnBwD6chtxdLpMYCHWEzN+oL5cyQtjykya19UgzbmKhxmhZgKC/LHxS2nYr9Q/qYPZ5Lr6jOL9+yQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31" - integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog== +"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.7.tgz#dc6c405e55c01b7657e1827a25332c4ac17e9cac" + integrity sha512-2wiIyo2BjtgU7HufSeDnL9L2O7zr8jmhFKuSr65VpRkUiRKRNpb0mdlk56+XPPKoIrfHqzbMuglDvZun0RISsA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-regexp-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-dynamic-import@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8" - integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg== +"@babel/plugin-transform-dynamic-import@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.29.7.tgz#a83a6faec5bab5b619adf9d0eac6c1c270123c2a" + integrity sha512-giOlEm/EFjfjr+te9NsdjkUo2v4f8rS/SXPumRVHAtbNcyNlvtREkU1dZzaIDclNpnaVhlCqRdFKhJBjBikzLg== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-exponentiation-operator@^7.26.3": - version "7.26.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz#e29f01b6de302c7c2c794277a48f04a9ca7f03bc" - integrity sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ== +"@babel/plugin-transform-explicit-resource-management@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.29.7.tgz#65c8b9f76ec915b02a0e1df703125a0fca58abaa" + integrity sha512-Rstj7coNz8sE+7Ju7ihpHLI564lsK5pUpNNlvptCIC/16E/S5hbl6n3kESPKdNRmqEWlpn5xpS5Q2dvXBsySLw== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/plugin-transform-destructuring" "^7.29.7" -"@babel/plugin-transform-export-namespace-from@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2" - integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww== +"@babel/plugin-transform-exponentiation-operator@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.29.7.tgz#00bf002fde8794356171f5d4df200f6bc0d5a303" + integrity sha512-zFpMOTLZBdW5LfObqcSbL6kefg4R4eLdmvS0wbN9M6D5Mym/sKm9toOoWyVOa+xDjvCnuWcHls2YonXwHvH3CQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-for-of@^7.26.9": - version "7.26.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz#27231f79d5170ef33b5111f07fe5cafeb2c96a56" - integrity sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg== +"@babel/plugin-transform-export-namespace-from@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.29.7.tgz#d6014f45cec61d7691335c6c9804204bee801d51" + integrity sha512-24B2nOy2TeJSMheqwPD4DDQOV/elLSIlKxjZt4i05H5AgdPdWR3n18HnNrcJ+j76WJd9gbwb9jPjNYUy6RautA== dependencies: - "@babel/helper-plugin-utils" "^7.26.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-function-name@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97" - integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA== +"@babel/plugin-transform-for-of@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.29.7.tgz#c65a678592117717aacdb10c1b73a9cb85e830be" + integrity sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ== dependencies: - "@babel/helper-compilation-targets" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/traverse" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7" -"@babel/plugin-transform-json-strings@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660" - integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw== +"@babel/plugin-transform-function-name@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.29.7.tgz#8b87f8a7504dbcd96135167e3fc4f61126a7bd86" + integrity sha512-otRWaHXE6fbAGkePvaj/kvs3HsqXfPhlnzwSOlnFgbqCPMd975dW+4wZ00WFBt+/YlBGcJwNrARQTOJOb4ZrIg== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-compilation-targets" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/traverse" "^7.29.7" -"@babel/plugin-transform-literals@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de" - integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ== +"@babel/plugin-transform-json-strings@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.29.7.tgz#f57d63dcc05b4481c281acedcd8fc4e3e439a1d4" + integrity sha512-RRnE2+eon1rJAq8MnoF1b5kTpY1vU88twHcvcKMrsqP/jxIRqDVs9iJB5fqPuqyeFAW0wJo4MlUIPpQCq/aRsg== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-logical-assignment-operators@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7" - integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q== +"@babel/plugin-transform-literals@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.29.7.tgz#b90bd47463326c2a9d779e1bd5e1f88b9f421921" + integrity sha512-DZ/oLP21ZuWx1vKqnoNv6/tvEK48AQOBRai40CX9dTjGluvT/YZCyY3rryDtyUqCEoyNroy5KKPwX2iQCiRvyw== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-member-expression-literals@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de" - integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA== +"@babel/plugin-transform-logical-assignment-operators@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.29.7.tgz#9b29425adf5c794967aabe4b046a046a167bac2f" + integrity sha512-A0H91hh6W8MFRkp5TqJmMr39jzGD1A1E1Ysiv2O06Sfbhkapm+XyIzxWCEh5kqwOZ1/8QZ0dY3SeQ7XBqfJd5Q== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-modules-amd@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5" - integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw== +"@babel/plugin-transform-member-expression-literals@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.29.7.tgz#1281689fa2fefc17b110d21ebafd0fe9402d5309" + integrity sha512-hl1kwFZCCiDyfH25Xmco9jTrkPgnS9pmOzSG7W5I4SaGbLeqKv417hcU2RKmaxoPEgsoJh7ZPOrnPGq99bHoUg== dependencies: - "@babel/helper-module-transforms" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-modules-commonjs@^7.26.3": - version "7.26.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz#8f011d44b20d02c3de44d8850d971d8497f981fb" - integrity sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ== +"@babel/plugin-transform-modules-amd@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.29.7.tgz#f05ca662c8a1dc4be2f337af9c7e80369c942d6c" + integrity sha512-fxtQoH3m5ywUSIfaH0FGCzWu4McsYon5bD3K4XnskC7f+OyQMj7rsOMi4NvvmJ83WwBAg4UCe+ov4VZlqEvyew== dependencies: - "@babel/helper-module-transforms" "^7.26.0" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-module-transforms" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-modules-systemjs@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8" - integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA== +"@babel/plugin-transform-modules-commonjs@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.29.7.tgz#70e6835abf2663dafbe94b8ef1f51de7351ef135" + integrity sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ== dependencies: - "@babel/helper-module-transforms" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" - "@babel/traverse" "^7.25.9" + "@babel/helper-module-transforms" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-modules-umd@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9" - integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw== +"@babel/plugin-transform-modules-systemjs@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.7.tgz#e575dd2ab9882906de120ff7dc9dee9914d8b6f3" + integrity sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ== dependencies: - "@babel/helper-module-transforms" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-module-transforms" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-validator-identifier" "^7.29.7" + "@babel/traverse" "^7.29.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a" - integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA== +"@babel/plugin-transform-modules-umd@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.29.7.tgz#391d1c0215aca6307257f2f608598dfe55feb6cf" + integrity sha512-B4UkaTK3QpgCwJnrxKfMPKdo92CN7OKXAlpAAnM3UPu0Q0lCCk57ylA9AJbRy2v8dDKOPAAWcoR6CMyeoHwRCA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-module-transforms" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-new-target@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd" - integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ== +"@babel/plugin-transform-named-capturing-groups-regex@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.7.tgz#21e75d847b31189842fa7a77703722ed4b43d27d" + integrity sha512-vuFoLwr4qnv2xbZ16SQd6uPcH5FNrLHhk/Jzo++0XJFcaDsr4gjJVg6j398oMHiC+83k/GiBzviwF5KBJkPUtQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-regexp-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-nullish-coalescing-operator@^7.26.6": - version "7.26.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz#fbf6b3c92cb509e7b319ee46e3da89c5bedd31fe" - integrity sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw== +"@babel/plugin-transform-new-target@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.29.7.tgz#714147ce7947e1b49cbd84137ca2e75e92b2a067" + integrity sha512-fEo41GmsOUhOBlw8ioo6zvjX5Xc2Lqkzlyfqbpsk3eB6TReV18uhxZ0esfEokVbY2+PVJAQHNKxER6lGrzNd3A== dependencies: - "@babel/helper-plugin-utils" "^7.26.5" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-numeric-separator@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1" - integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q== +"@babel/plugin-transform-nullish-coalescing-operator@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.29.7.tgz#8a54cdf88c3f50433a6173117a286195b67714cc" + integrity sha512-idmp1dFaekP9GbcMvG24Kvw2BfhFZjHnNJCkV4WuIY4PskJzwI3f1N5OdgYke38T7rftO6ERulFRn2cFeZwRkg== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-object-rest-spread@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18" - integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg== +"@babel/plugin-transform-numeric-separator@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.29.7.tgz#0266d5cd42ab87ec40fee45a4e36483cfdcbc66a" + integrity sha512-zR7fv/z14OjgHl4AgRtkDBvBMhIzCxqV/qN/2BCRC7LjFwvuzjYe7gDWxC4Wl/SNsLM6SE1IWvRPYMgSJaUvNw== dependencies: - "@babel/helper-compilation-targets" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/plugin-transform-parameters" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-object-super@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03" - integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A== +"@babel/plugin-transform-object-rest-spread@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.29.7.tgz#e0d5060241803922c545676613cc8acbbda0d266" + integrity sha512-Ld98jn4c0smUywL57m7SgsHq3OpThOa6LqZJif3G6jYOovPleoFhVrBJ1WegRApSFB2wu4+RelAj9AC9G08Z4A== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/helper-replace-supers" "^7.25.9" + "@babel/helper-compilation-targets" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/plugin-transform-destructuring" "^7.29.7" + "@babel/plugin-transform-parameters" "^7.29.7" + "@babel/traverse" "^7.29.7" -"@babel/plugin-transform-optional-catch-binding@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3" - integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g== +"@babel/plugin-transform-object-super@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.29.7.tgz#e89283d14fa3c35817d4493ffc6bc649aa10e4eb" + integrity sha512-Ea/diGcw0twB5IlZPO5sgET6fJsLJqPABqTuFWIR+iMPGPZJkATEIWx0wa+aEQ5UY1CBQyP/gkAiLEqn1vBiQA== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-replace-supers" "^7.29.7" -"@babel/plugin-transform-optional-chaining@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd" - integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A== +"@babel/plugin-transform-optional-catch-binding@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.29.7.tgz#729664f79985be504eba112c51de9f71d009030b" + integrity sha512-sLsyndxK2VwX6yNUOakMb7Sh553ZTe/vVM1XJ+9Z5aW1ytsc8xOIwmyk05NNjN60vkc5/KqoTH6hB4V41LJhng== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257" - integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g== +"@babel/plugin-transform-optional-chaining@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.29.7.tgz#b84a1b574b3c73001023092567e16c492b720e51" + integrity sha512-6GM1dhvK3gNODkXcEcMCOLEDCLSoZ/sBbro2Ax8HURyasQ4NshagQixkRFdh5niI6E4gmA/jYI/4aT7rRos3ZQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7" -"@babel/plugin-transform-private-methods@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57" - integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw== +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.29.7.tgz#a5ddc3b9bfb534814cb8334cbeba47d9cf9db090" + integrity sha512-ZDOBqV/qLYJI0YElr8DcENEyARsFQeESqWXH6gZlghYXuPPjvweuDhP4VyEi4BlUBlLRFZVjxoZDMjxhLW766g== dependencies: - "@babel/helper-create-class-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-private-property-in-object@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33" - integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw== +"@babel/plugin-transform-private-methods@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.29.7.tgz#cea8bd3ab99533892897a02999d5b752584ad145" + integrity sha512-/6Rz4DK1ETDEM/bWHsPHcaEe7ZaT1EqSXjtSP/L0DijOYuaUhiRiOKcwpZ8P7zR4xXEHc2ITdiCgBm9Tpyv9ug== dependencies: - "@babel/helper-annotate-as-pure" "^7.25.9" - "@babel/helper-create-class-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-property-literals@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f" - integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA== +"@babel/plugin-transform-private-property-in-object@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.29.7.tgz#4a2f6be5aba47be7afbdb4cd7903c46edf3a7661" + integrity sha512-+BNo06dnrzdNNqCm1X6YUaVv0DKk8Q+JYcoZfOkLhYWNCXzlwTSRq8zGWayT1csjcpNXV9CQTBRRbmTLZac5cA== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-annotate-as-pure" "^7.29.7" + "@babel/helper-create-class-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-regenerator@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b" - integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg== +"@babel/plugin-transform-property-literals@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.29.7.tgz#d45817cd72f9e134ab1f7fbb79264cfcb85cf636" + integrity sha512-bOMRLQuI0A5ZqHq3OWJ89/rXpJ/NJrbVhXiP4zwPGMs6kpcVsuTUNjwoE30K0Qm3mf48a/TnRYYD6vPNqcg6jA== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - regenerator-transform "^0.15.2" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-regexp-modifiers@^7.26.0": - version "7.26.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850" - integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw== +"@babel/plugin-transform-regenerator@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.7.tgz#0f42626a7dbb0e7a7f52e036d3e43deebdc3ea4e" + integrity sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-reserved-words@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce" - integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg== +"@babel/plugin-transform-regexp-modifiers@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.29.7.tgz#68311c0c10af2198212528863f8542843e424025" + integrity sha512-mB5Fs0VWrJ42ZCmc8114v60qetdaUVNkj9PmSZRmanCZM3S9hm0CFRLjRmYIsuXav14l2jvZ+4T8iiCGnhj3nQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-regexp-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + +"@babel/plugin-transform-reserved-words@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.29.7.tgz#a6feeb179b36a5f1fc6e3154c1eb727bdbe35876" + integrity sha512-5+YhdpVgmfSmwZyLMftfaiffLRMHjzIRHFHHLdibcSyJm2pasMrKHrO3Ptrt2DRshjvpgjEJJ1zVW14WPq/6QA== + dependencies: + "@babel/helper-plugin-utils" "^7.29.7" "@babel/plugin-transform-runtime@^7.19.6": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.26.10.tgz#6b4504233de8238e7d666c15cde681dc62adff87" - integrity sha512-NWaL2qG6HRpONTnj4JvDU6th4jYeZOJgu3QhmFTCihib0ermtOJqktA5BduGm3suhhVe9EMP9c9+mfJ/I9slqw== - dependencies: - "@babel/helper-module-imports" "^7.25.9" - "@babel/helper-plugin-utils" "^7.26.5" - babel-plugin-polyfill-corejs2 "^0.4.10" - babel-plugin-polyfill-corejs3 "^0.11.0" - babel-plugin-polyfill-regenerator "^0.6.1" + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.29.7.tgz#7c7fb6e2a46dce67e278b6cc84421c1d16da5695" + integrity sha512-xmAscdE/AsqRW7vutbPNoUmu/nF5SrLKPs7aoJgEjo35lLKA/Bc0i2rMv/hr1+Y0o1bQCiVtith3u2vdgRL39Q== + dependencies: + "@babel/helper-module-imports" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + babel-plugin-polyfill-corejs2 "^0.4.14" + babel-plugin-polyfill-corejs3 "^0.13.0" + babel-plugin-polyfill-regenerator "^0.6.5" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2" - integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng== +"@babel/plugin-transform-shorthand-properties@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.29.7.tgz#25c0436b98f4bd9ca4b98e1fbd662743bbaab9bf" + integrity sha512-I+WYbGBAiCn7nA6xBrlgPH+MB7HWb4u8pv5S0Pv7OtwNvIFvCCb24YlttKEeUFVurfBCEaOTnuhlqsb7f0Z5Dg== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-spread@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9" - integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A== +"@babel/plugin-transform-spread@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.7.tgz#a128bcdd6b5e5e47054907b2e50bc19c3f856edd" + integrity sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7" -"@babel/plugin-transform-sticky-regex@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32" - integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA== +"@babel/plugin-transform-sticky-regex@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.29.7.tgz#a42c0fd1fa42f7e98e1e0c7757f72a1bbca3a015" + integrity sha512-BCHzNYJGe9l7EpwwDBN/ztlL2NYFFq8hp9ddjtUEM9f2O7S7kKV/lL6Fwo7IF7NSkYhPK2vO+86nIGltA90MsA== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-template-literals@^7.26.8": - version "7.26.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz#966b15d153a991172a540a69ad5e1845ced990b5" - integrity sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q== +"@babel/plugin-transform-template-literals@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.29.7.tgz#ada97d8e0832bca8edb315888aa654b1570f3835" + integrity sha512-NCSEJ4sLFU2gqAub45HYh4fus2yQ36rr6ei6vpU7NdoJqCpxvEG8E6eJpscGyXP3VHD2Ny+fSXr04k1hoUrFqA== dependencies: - "@babel/helper-plugin-utils" "^7.26.5" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-typeof-symbol@^7.26.7": - version "7.26.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz#d0e33acd9223744c1e857dbd6fa17bd0a3786937" - integrity sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw== +"@babel/plugin-transform-typeof-symbol@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.29.7.tgz#d848a4677c1ee3485ab017f4018f04597798911c" + integrity sha512-223mNGoTkBiTEWFoK+Q6Go3tueMRclO8vxxxxquNCYuNI4jWOofFKJRRDu6SDrB8Sgo1UEGW9T4GAQ8ZyRso1A== dependencies: - "@babel/helper-plugin-utils" "^7.26.5" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-unicode-escapes@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82" - integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q== +"@babel/plugin-transform-unicode-escapes@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.29.7.tgz#1e99554b0cddfd650d649a9f2b996049893e5720" + integrity sha512-jCfXxSjf94lf4E0hKE0AByxF6F3/pVFqRdUUNkDJhsY0m1ZKjnN6ZYyMeHNpzflxb/0q5b7t3p+BE+SLF1WOtA== dependencies: - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-unicode-property-regex@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3" - integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg== +"@babel/plugin-transform-unicode-property-regex@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.29.7.tgz#44444afc73768c2190fac4d95f7716817b7f204a" + integrity sha512-OgZ+zoAJgZLUCunsTRQ5LAjOywDv5zzZ2/hQ5aMw1pGXyY2rtE8/chXYUmu3AlVHKpm10KEdG9aMwbI/K76ZGw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-regexp-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-unicode-regex@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1" - integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA== +"@babel/plugin-transform-unicode-regex@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.29.7.tgz#c3064b293ff7f1794b71f7650eec8db9896d3e59" + integrity sha512-7D/x/23/d/3VqZ0QA+LGbZMlGwZjztBygSWWWsfTPoQ1oQ6Q1P6Mr3d0kk42XabyUVw+fha3LqdRsFqeKqvCyA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-regexp-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" -"@babel/plugin-transform-unicode-sets-regex@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe" - integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ== +"@babel/plugin-transform-unicode-sets-regex@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.29.7.tgz#b03ac9f27326f6197e8e574add83bbf33fc34ecd" + integrity sha512-BLOhLht9DOJwIxlmp91wHvkXv1lguuHS3/FwUO8HL1H0u8s4hR1gASVFyilu9iGtcTRYqjTZmlsFFeQletntEg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.9" - "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-create-regexp-features-plugin" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" "@babel/preset-env@^7.20.2": - version "7.26.9" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.9.tgz#2ec64e903d0efe743699f77a10bdf7955c2123c3" - integrity sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ== - dependencies: - "@babel/compat-data" "^7.26.8" - "@babel/helper-compilation-targets" "^7.26.5" - "@babel/helper-plugin-utils" "^7.26.5" - "@babel/helper-validator-option" "^7.25.9" - "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9" - "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9" + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.29.7.tgz#5e2ab5e764b493fdefc99c43aeaa70a9533a37fd" + integrity sha512-GYzX36n1nsciIb0uyH0GHwxwtNwPQIcpxSeiVLDtG/B7jB5xXgchnmL1f/jCX5o+pwnaDBtO60ONSJhEBJfxYA== + dependencies: + "@babel/compat-data" "^7.29.7" + "@babel/helper-compilation-targets" "^7.29.7" + "@babel/helper-plugin-utils" "^7.29.7" + "@babel/helper-validator-option" "^7.29.7" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.29.7" + "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.29.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.29.7" + "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array" "^7.29.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.29.7" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.29.7" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" - "@babel/plugin-syntax-import-assertions" "^7.26.0" - "@babel/plugin-syntax-import-attributes" "^7.26.0" + "@babel/plugin-syntax-import-assertions" "^7.29.7" + "@babel/plugin-syntax-import-attributes" "^7.29.7" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.25.9" - "@babel/plugin-transform-async-generator-functions" "^7.26.8" - "@babel/plugin-transform-async-to-generator" "^7.25.9" - "@babel/plugin-transform-block-scoped-functions" "^7.26.5" - "@babel/plugin-transform-block-scoping" "^7.25.9" - "@babel/plugin-transform-class-properties" "^7.25.9" - "@babel/plugin-transform-class-static-block" "^7.26.0" - "@babel/plugin-transform-classes" "^7.25.9" - "@babel/plugin-transform-computed-properties" "^7.25.9" - "@babel/plugin-transform-destructuring" "^7.25.9" - "@babel/plugin-transform-dotall-regex" "^7.25.9" - "@babel/plugin-transform-duplicate-keys" "^7.25.9" - "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9" - "@babel/plugin-transform-dynamic-import" "^7.25.9" - "@babel/plugin-transform-exponentiation-operator" "^7.26.3" - "@babel/plugin-transform-export-namespace-from" "^7.25.9" - "@babel/plugin-transform-for-of" "^7.26.9" - "@babel/plugin-transform-function-name" "^7.25.9" - "@babel/plugin-transform-json-strings" "^7.25.9" - "@babel/plugin-transform-literals" "^7.25.9" - "@babel/plugin-transform-logical-assignment-operators" "^7.25.9" - "@babel/plugin-transform-member-expression-literals" "^7.25.9" - "@babel/plugin-transform-modules-amd" "^7.25.9" - "@babel/plugin-transform-modules-commonjs" "^7.26.3" - "@babel/plugin-transform-modules-systemjs" "^7.25.9" - "@babel/plugin-transform-modules-umd" "^7.25.9" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9" - "@babel/plugin-transform-new-target" "^7.25.9" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.26.6" - "@babel/plugin-transform-numeric-separator" "^7.25.9" - "@babel/plugin-transform-object-rest-spread" "^7.25.9" - "@babel/plugin-transform-object-super" "^7.25.9" - "@babel/plugin-transform-optional-catch-binding" "^7.25.9" - "@babel/plugin-transform-optional-chaining" "^7.25.9" - "@babel/plugin-transform-parameters" "^7.25.9" - "@babel/plugin-transform-private-methods" "^7.25.9" - "@babel/plugin-transform-private-property-in-object" "^7.25.9" - "@babel/plugin-transform-property-literals" "^7.25.9" - "@babel/plugin-transform-regenerator" "^7.25.9" - "@babel/plugin-transform-regexp-modifiers" "^7.26.0" - "@babel/plugin-transform-reserved-words" "^7.25.9" - "@babel/plugin-transform-shorthand-properties" "^7.25.9" - "@babel/plugin-transform-spread" "^7.25.9" - "@babel/plugin-transform-sticky-regex" "^7.25.9" - "@babel/plugin-transform-template-literals" "^7.26.8" - "@babel/plugin-transform-typeof-symbol" "^7.26.7" - "@babel/plugin-transform-unicode-escapes" "^7.25.9" - "@babel/plugin-transform-unicode-property-regex" "^7.25.9" - "@babel/plugin-transform-unicode-regex" "^7.25.9" - "@babel/plugin-transform-unicode-sets-regex" "^7.25.9" + "@babel/plugin-transform-arrow-functions" "^7.29.7" + "@babel/plugin-transform-async-generator-functions" "^7.29.7" + "@babel/plugin-transform-async-to-generator" "^7.29.7" + "@babel/plugin-transform-block-scoped-functions" "^7.29.7" + "@babel/plugin-transform-block-scoping" "^7.29.7" + "@babel/plugin-transform-class-properties" "^7.29.7" + "@babel/plugin-transform-class-static-block" "^7.29.7" + "@babel/plugin-transform-classes" "^7.29.7" + "@babel/plugin-transform-computed-properties" "^7.29.7" + "@babel/plugin-transform-destructuring" "^7.29.7" + "@babel/plugin-transform-dotall-regex" "^7.29.7" + "@babel/plugin-transform-duplicate-keys" "^7.29.7" + "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.29.7" + "@babel/plugin-transform-dynamic-import" "^7.29.7" + "@babel/plugin-transform-explicit-resource-management" "^7.29.7" + "@babel/plugin-transform-exponentiation-operator" "^7.29.7" + "@babel/plugin-transform-export-namespace-from" "^7.29.7" + "@babel/plugin-transform-for-of" "^7.29.7" + "@babel/plugin-transform-function-name" "^7.29.7" + "@babel/plugin-transform-json-strings" "^7.29.7" + "@babel/plugin-transform-literals" "^7.29.7" + "@babel/plugin-transform-logical-assignment-operators" "^7.29.7" + "@babel/plugin-transform-member-expression-literals" "^7.29.7" + "@babel/plugin-transform-modules-amd" "^7.29.7" + "@babel/plugin-transform-modules-commonjs" "^7.29.7" + "@babel/plugin-transform-modules-systemjs" "^7.29.7" + "@babel/plugin-transform-modules-umd" "^7.29.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.29.7" + "@babel/plugin-transform-new-target" "^7.29.7" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.29.7" + "@babel/plugin-transform-numeric-separator" "^7.29.7" + "@babel/plugin-transform-object-rest-spread" "^7.29.7" + "@babel/plugin-transform-object-super" "^7.29.7" + "@babel/plugin-transform-optional-catch-binding" "^7.29.7" + "@babel/plugin-transform-optional-chaining" "^7.29.7" + "@babel/plugin-transform-parameters" "^7.29.7" + "@babel/plugin-transform-private-methods" "^7.29.7" + "@babel/plugin-transform-private-property-in-object" "^7.29.7" + "@babel/plugin-transform-property-literals" "^7.29.7" + "@babel/plugin-transform-regenerator" "^7.29.7" + "@babel/plugin-transform-regexp-modifiers" "^7.29.7" + "@babel/plugin-transform-reserved-words" "^7.29.7" + "@babel/plugin-transform-shorthand-properties" "^7.29.7" + "@babel/plugin-transform-spread" "^7.29.7" + "@babel/plugin-transform-sticky-regex" "^7.29.7" + "@babel/plugin-transform-template-literals" "^7.29.7" + "@babel/plugin-transform-typeof-symbol" "^7.29.7" + "@babel/plugin-transform-unicode-escapes" "^7.29.7" + "@babel/plugin-transform-unicode-property-regex" "^7.29.7" + "@babel/plugin-transform-unicode-regex" "^7.29.7" + "@babel/plugin-transform-unicode-sets-regex" "^7.29.7" "@babel/preset-modules" "0.1.6-no-external-plugins" - babel-plugin-polyfill-corejs2 "^0.4.10" - babel-plugin-polyfill-corejs3 "^0.11.0" - babel-plugin-polyfill-regenerator "^0.6.1" - core-js-compat "^3.40.0" + babel-plugin-polyfill-corejs2 "^0.4.15" + babel-plugin-polyfill-corejs3 "^0.14.0" + babel-plugin-polyfill-regenerator "^0.6.6" + core-js-compat "^3.48.0" semver "^6.3.1" "@babel/preset-modules@0.1.6-no-external-plugins": @@ -809,42 +826,40 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/runtime@^7.12.5", "@babel/runtime@^7.8.4": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.10.tgz#a07b4d8fa27af131a633d7b3524db803eb4764c2" - integrity sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw== - dependencies: - regenerator-runtime "^0.14.0" - -"@babel/template@^7.25.9", "@babel/template@^7.26.9": - version "7.26.9" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.26.9.tgz#4577ad3ddf43d194528cff4e1fa6b232fa609bb2" - integrity sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA== - dependencies: - "@babel/code-frame" "^7.26.2" - "@babel/parser" "^7.26.9" - "@babel/types" "^7.26.9" - -"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.10", "@babel/traverse@^7.26.5", "@babel/traverse@^7.26.8", "@babel/traverse@^7.26.9": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.10.tgz#43cca33d76005dbaa93024fae536cc1946a4c380" - integrity sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A== - dependencies: - "@babel/code-frame" "^7.26.2" - "@babel/generator" "^7.26.10" - "@babel/parser" "^7.26.10" - "@babel/template" "^7.26.9" - "@babel/types" "^7.26.10" +"@babel/runtime@^7.12.5": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.7.tgz#12022450c45a4da6d8d8287b18a4ff2ddb23f768" + integrity sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw== + +"@babel/template@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.29.7.tgz#4d9d4004f645cdd304de958c725162784ecac700" + integrity sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg== + dependencies: + "@babel/code-frame" "^7.29.7" + "@babel/parser" "^7.29.7" + "@babel/types" "^7.29.7" + +"@babel/traverse@^7.29.7": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.7.tgz#c47b07a41b95da0907d026b5dd894d98de7d2f2d" + integrity sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw== + dependencies: + "@babel/code-frame" "^7.29.7" + "@babel/generator" "^7.29.7" + "@babel/helper-globals" "^7.29.7" + "@babel/parser" "^7.29.7" + "@babel/template" "^7.29.7" + "@babel/types" "^7.29.7" debug "^4.3.1" - globals "^11.1.0" -"@babel/types@^7.25.9", "@babel/types@^7.26.10", "@babel/types@^7.26.9", "@babel/types@^7.4.4": - version "7.26.10" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.10.tgz#396382f6335bd4feb65741eacfc808218f859259" - integrity sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ== +"@babel/types@^7.29.7", "@babel/types@^7.4.4": + version "7.29.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.7.tgz#8005e31d82712ee7adaef6e23c63b71a62770a92" + integrity sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA== dependencies: - "@babel/helper-string-parser" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" + "@babel/helper-string-parser" "^7.29.7" + "@babel/helper-validator-identifier" "^7.29.7" "@colors/colors@1.5.0": version "1.5.0" @@ -857,16 +872,16 @@ integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@eslint-community/eslint-utils@^4.2.0": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz#b0fc7e06d0c94f801537fd4237edc2706d3b8e4c" - integrity sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w== + version "4.9.1" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz#4e90af67bc51ddee6cdef5284edf572ec376b595" + integrity sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ== dependencies: eslint-visitor-keys "^3.4.3" "@eslint-community/regexpp@^4.6.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0" - integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ== + version "4.12.2" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b" + integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew== "@eslint/eslintrc@^2.1.4": version "2.1.4" @@ -925,13 +940,20 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== -"@jridgewell/gen-mapping@^0.3.5": - version "0.3.8" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142" - integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA== +"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f" + integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA== + dependencies: + "@jridgewell/sourcemap-codec" "^1.5.0" + "@jridgewell/trace-mapping" "^0.3.24" + +"@jridgewell/remapping@^2.3.5": + version "2.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1" + integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ== dependencies: - "@jridgewell/set-array" "^1.2.1" - "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" "@jridgewell/resolve-uri@^3.1.0": @@ -939,28 +961,23 @@ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== -"@jridgewell/set-array@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" - integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== - "@jridgewell/source-map@^0.3.3": - version "0.3.6" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a" - integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ== + version "0.3.11" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba" + integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA== dependencies: "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" - integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== +"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0": + version "1.5.5" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba" + integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og== -"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": - version "0.3.25" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" - integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== +"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28": + version "0.3.31" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0" + integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -986,94 +1003,94 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@parcel/watcher-android-arm64@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz#507f836d7e2042f798c7d07ad19c3546f9848ac1" - integrity sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA== - -"@parcel/watcher-darwin-arm64@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz#3d26dce38de6590ef79c47ec2c55793c06ad4f67" - integrity sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw== - -"@parcel/watcher-darwin-x64@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz#99f3af3869069ccf774e4ddfccf7e64fd2311ef8" - integrity sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg== - -"@parcel/watcher-freebsd-x64@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz#14d6857741a9f51dfe51d5b08b7c8afdbc73ad9b" - integrity sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ== - -"@parcel/watcher-linux-arm-glibc@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz#43c3246d6892381db473bb4f663229ad20b609a1" - integrity sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA== - -"@parcel/watcher-linux-arm-musl@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz#663750f7090bb6278d2210de643eb8a3f780d08e" - integrity sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q== - -"@parcel/watcher-linux-arm64-glibc@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz#ba60e1f56977f7e47cd7e31ad65d15fdcbd07e30" - integrity sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w== - -"@parcel/watcher-linux-arm64-musl@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz#f7fbcdff2f04c526f96eac01f97419a6a99855d2" - integrity sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg== - -"@parcel/watcher-linux-x64-glibc@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz#4d2ea0f633eb1917d83d483392ce6181b6a92e4e" - integrity sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A== - -"@parcel/watcher-linux-x64-musl@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz#277b346b05db54f55657301dd77bdf99d63606ee" - integrity sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg== - -"@parcel/watcher-win32-arm64@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz#7e9e02a26784d47503de1d10e8eab6cceb524243" - integrity sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw== - -"@parcel/watcher-win32-ia32@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz#2d0f94fa59a873cdc584bf7f6b1dc628ddf976e6" - integrity sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ== - -"@parcel/watcher-win32-x64@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz#ae52693259664ba6f2228fa61d7ee44b64ea0947" - integrity sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA== +"@parcel/watcher-android-arm64@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz#5f32e0dba356f4ac9a11068d2a5c134ca3ba6564" + integrity sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A== + +"@parcel/watcher-darwin-arm64@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz#88d3e720b59b1eceffce98dac46d7c40e8be5e8e" + integrity sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA== + +"@parcel/watcher-darwin-x64@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz#bf05d76a78bc15974f15ec3671848698b0838063" + integrity sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg== + +"@parcel/watcher-freebsd-x64@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz#8bc26e9848e7303ac82922a5ae1b1ef1bdb48a53" + integrity sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng== + +"@parcel/watcher-linux-arm-glibc@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz#1328fee1deb0c2d7865079ef53a2ba4cc2f8b40a" + integrity sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ== + +"@parcel/watcher-linux-arm-musl@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz#bad0f45cb3e2157746db8b9d22db6a125711f152" + integrity sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg== + +"@parcel/watcher-linux-arm64-glibc@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz#b75913fbd501d9523c5f35d420957bf7d0204809" + integrity sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA== + +"@parcel/watcher-linux-arm64-musl@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz#da5621a6a576070c8c0de60dea8b46dc9c3827d4" + integrity sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA== + +"@parcel/watcher-linux-x64-glibc@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz#ce437accdc4b30f93a090b4a221fd95cd9b89639" + integrity sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ== + +"@parcel/watcher-linux-x64-musl@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz#02400c54b4a67efcc7e2327b249711920ac969e2" + integrity sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg== + +"@parcel/watcher-win32-arm64@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz#caae3d3c7583ca0a7171e6bd142c34d20ea1691e" + integrity sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q== + +"@parcel/watcher-win32-ia32@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz#9ac922550896dfe47bfc5ae3be4f1bcaf8155d6d" + integrity sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g== + +"@parcel/watcher-win32-x64@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz#73fdafba2e21c448f0e456bbe13178d8fe11739d" + integrity sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw== "@parcel/watcher@^2.4.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.5.1.tgz#342507a9cfaaf172479a882309def1e991fb1200" - integrity sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg== + version "2.5.6" + resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.5.6.tgz#3f932828c894f06d0ad9cfefade1756ecc6ef1f1" + integrity sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ== dependencies: - detect-libc "^1.0.3" + detect-libc "^2.0.3" is-glob "^4.0.3" - micromatch "^4.0.5" node-addon-api "^7.0.0" + picomatch "^4.0.3" optionalDependencies: - "@parcel/watcher-android-arm64" "2.5.1" - "@parcel/watcher-darwin-arm64" "2.5.1" - "@parcel/watcher-darwin-x64" "2.5.1" - "@parcel/watcher-freebsd-x64" "2.5.1" - "@parcel/watcher-linux-arm-glibc" "2.5.1" - "@parcel/watcher-linux-arm-musl" "2.5.1" - "@parcel/watcher-linux-arm64-glibc" "2.5.1" - "@parcel/watcher-linux-arm64-musl" "2.5.1" - "@parcel/watcher-linux-x64-glibc" "2.5.1" - "@parcel/watcher-linux-x64-musl" "2.5.1" - "@parcel/watcher-win32-arm64" "2.5.1" - "@parcel/watcher-win32-ia32" "2.5.1" - "@parcel/watcher-win32-x64" "2.5.1" + "@parcel/watcher-android-arm64" "2.5.6" + "@parcel/watcher-darwin-arm64" "2.5.6" + "@parcel/watcher-darwin-x64" "2.5.6" + "@parcel/watcher-freebsd-x64" "2.5.6" + "@parcel/watcher-linux-arm-glibc" "2.5.6" + "@parcel/watcher-linux-arm-musl" "2.5.6" + "@parcel/watcher-linux-arm64-glibc" "2.5.6" + "@parcel/watcher-linux-arm64-musl" "2.5.6" + "@parcel/watcher-linux-x64-glibc" "2.5.6" + "@parcel/watcher-linux-x64-musl" "2.5.6" + "@parcel/watcher-win32-arm64" "2.5.6" + "@parcel/watcher-win32-ia32" "2.5.6" + "@parcel/watcher-win32-x64" "2.5.6" "@popperjs/core@^2.11.6": version "2.11.8" @@ -1081,26 +1098,26 @@ integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== "@rails/actioncable@^7.0": - version "7.2.201" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.2.201.tgz#bfb3da01b3e2462f5a18f372c52dedd7de76037f" - integrity sha512-wsTdWoZ5EfG5k3t7ORdyQF0ZmDEgN4aVPCanHAiNEwCROqibSZMXXmCbH7IDJUVri4FOeAVwwbPINI7HVHPKBw== + version "7.2.301" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.2.301.tgz#63035b8e00790343148457cc6dd8b391d1161720" + integrity sha512-tFLZ5tocUeUkyQeHjN5l/lL7Jnvy0eeQZlwyq4pe4Ggew+rGdiKYudG3mHMqfKHBzmC4nV31aRhnsSjrNmNBGQ== "@rails/actioncable@~7.1": - version "7.1.501" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.501.tgz#52e1abda14e213ebf1a62c4aed61563ca5c6cfb1" - integrity sha512-oQOkHNemn+xPdtOgO/nae2S/GSvuII560pb5BGjTXfOd70JJ4yw9LLp2geDth45we5PaGw2BSIY0ImaG71NPNQ== + version "7.1.600" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.600.tgz#f6f10bc7321a469ba6666502d3bb6e110074576b" + integrity sha512-BZMLShJhaqMZcl5hHXN2w5cOvXVbV+Vj7kcQBM8GGXITofBMyeVS4F0ZWZYJm2ZezfC5WAZuZitLLtP9piRfNA== "@rails/activestorage@~7.1": - version "7.1.501" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.501.tgz#f2e59c00d95eba5e5e5902e1a6750a9380f9dd12" - integrity sha512-1EgcX5Phfg3KJkk2F5t7JohXIDau0T0soqYzRG5WUDvxDsXQW4FGB+t1PnbeEXHmy/N9scL8IFevEt4RtLrnkA== + version "7.1.600" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.600.tgz#c85daa4d325a6d8a46e9ee4d0bc23768ecd4c327" + integrity sha512-bQ+y1O7Rrxnu1Ng65f1pNTa3e7qztzYb3ULX66j+QMqcrMpxI0gwejuKGtVWQ95po0PXcIVv0D5egJC2wpasBQ== dependencies: spark-md5 "^3.0.1" "@rails/ujs@~7.1": - version "7.1.501" - resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.501.tgz#e560a7b6885a12a659c4beb47f4336c8a9353056" - integrity sha512-7EDRGUlgns12IgP3SXVSaxA3CwRzbLOypPXn1EqEZiZ/NS/PwaQ/oa7Z2VRO4B46JifoVr0PYg+G5ERSGQJHxQ== + version "7.1.600" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.600.tgz#781d2737f3a81da81e78d93ec779099871288965" + integrity sha512-ntMYJ8++n1zcIJ1g75or7Va9IU3ueCHgp9IJk7Ny7eFEbu0Kx40EHZ2FNhoxoUEjlF5NifCFCbvoK5rDK5HpIQ== "@rtsao/scc@^1.1.0": version "1.1.0" @@ -1113,28 +1130,12 @@ integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA== "@types/cors@^2.8.12": - version "2.8.17" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b" - integrity sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA== + version "2.8.19" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.19.tgz#d93ea2673fd8c9f697367f5eeefc2bbfa94f0342" + integrity sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg== dependencies: "@types/node" "*" -"@types/eslint-scope@^3.7.7": - version "3.7.7" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" - integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584" - integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - "@types/eslint@^7.29.0": version "7.29.0" resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" @@ -1143,12 +1144,12 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^1.0.6": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" - integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== +"@types/estree@*", "@types/estree@^1.0.8": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.9.tgz#cf3f0e876d7bee15a93ab925b82bf570a3904a24" + integrity sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg== -"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -1159,21 +1160,28 @@ integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== "@types/node@*", "@types/node@>=10.0.0": - version "22.13.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.10.tgz#df9ea358c5ed991266becc3109dc2dc9125d77e4" - integrity sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw== + version "26.1.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-26.1.1.tgz#bad758d601e97d6cf457d204ee76a35fce7bd119" + integrity sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw== dependencies: - undici-types "~6.20.0" + undici-types "~8.3.0" "@types/parse-json@^4.0.0": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== +"@types/ws@^8.5.12": + version "8.18.1" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9" + integrity sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg== + dependencies: + "@types/node" "*" + "@ungap/structured-clone@^1.2.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8" - integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g== + version "1.3.3" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.3.tgz#094041e1a4cb1987f038335421281ac8be390bcc" + integrity sha512-60YRaenCQcVjYEKOcG824+DRGGIQ3VKErcBoAEDJZz5bKIs2ZG+X/H9Nk+Q6EVkwJk5QNApxbrc5QtBSwtrXAg== "@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1": version "1.14.1" @@ -1329,15 +1337,20 @@ accepts@~1.3.4: mime-types "~2.1.34" negotiator "0.6.3" +acorn-import-phases@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz#16eb850ba99a056cb7cbfe872ffb8972e18c8bd7" + integrity sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ== + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^8.14.0, acorn@^8.8.2, acorn@^8.9.0: - version "8.14.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.1.tgz#721d5dc10f7d5b5609a891773d47731796935dfb" - integrity sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg== +acorn@^8.15.0, acorn@^8.16.0, acorn@^8.9.0: + version "8.17.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.17.0.tgz#1785adb84faf8d8add10369b93826fc2bd08f1fe" + integrity sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg== ajv-formats@^2.1.1: version "2.1.1" @@ -1359,9 +1372,9 @@ ajv-keywords@^5.1.0: fast-deep-equal "^3.1.3" ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + version "6.15.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.15.0.tgz#07e982c74626167aa7a2495c53817892d7139492" + integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -1369,9 +1382,9 @@ ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.9.0: - version "8.17.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" - integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== + version "8.20.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.20.0.tgz#304b3636add88ba7d936760dd50ece006dea95f9" + integrity sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA== dependencies: fast-deep-equal "^3.1.3" fast-uri "^3.0.1" @@ -1411,19 +1424,21 @@ array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2: call-bound "^1.0.3" is-array-buffer "^3.0.5" -array-includes@^3.1.8: - version "3.1.8" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" - integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== +array-includes@^3.1.9: + version "3.1.9" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a" + integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.4" define-properties "^1.2.1" - es-abstract "^1.23.2" - es-object-atoms "^1.0.0" - get-intrinsic "^1.2.4" - is-string "^1.0.7" + es-abstract "^1.24.0" + es-object-atoms "^1.1.1" + get-intrinsic "^1.3.0" + is-string "^1.1.1" + math-intrinsics "^1.1.0" -array.prototype.findlastindex@^1.2.5: +array.prototype.findlastindex@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz#cfa1065c81dcb64e34557c9b81d012f6a421c564" integrity sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ== @@ -1436,7 +1451,7 @@ array.prototype.findlastindex@^1.2.5: es-object-atoms "^1.1.1" es-shim-unscopables "^1.1.0" -array.prototype.flat@^1.3.2: +array.prototype.flat@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5" integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg== @@ -1446,7 +1461,7 @@ array.prototype.flat@^1.3.2: es-abstract "^1.23.5" es-shim-unscopables "^1.0.2" -array.prototype.flatmap@^1.3.2: +array.prototype.flatmap@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b" integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg== @@ -1510,29 +1525,37 @@ babel-plugin-macros@^3.1.0: cosmiconfig "^7.0.0" resolve "^1.19.0" -babel-plugin-polyfill-corejs2@^0.4.10: - version "0.4.12" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz#ca55bbec8ab0edeeef3d7b8ffd75322e210879a9" - integrity sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og== +babel-plugin-polyfill-corejs2@^0.4.14, babel-plugin-polyfill-corejs2@^0.4.15: + version "0.4.17" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.17.tgz#198f970f1c99a856b466d1187e88ce30bd199d91" + integrity sha512-aTyf30K/rqAsNwN76zYrdtx8obu0E4KoUME29B1xj+B3WxgvWkp943vYQ+z8Mv3lw9xHXMHpvSPOBxzAkIa94w== dependencies: - "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.3" + "@babel/compat-data" "^7.28.6" + "@babel/helper-define-polyfill-provider" "^0.6.8" semver "^6.3.1" -babel-plugin-polyfill-corejs3@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz#4e4e182f1bb37c7ba62e2af81d8dd09df31344f6" - integrity sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ== +babel-plugin-polyfill-corejs3@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz#bb7f6aeef7addff17f7602a08a6d19a128c30164" + integrity sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.3" - core-js-compat "^3.40.0" + "@babel/helper-define-polyfill-provider" "^0.6.5" + core-js-compat "^3.43.0" -babel-plugin-polyfill-regenerator@^0.6.1: - version "0.6.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz#abeb1f3f1c762eace37587f42548b08b57789bc8" - integrity sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q== +babel-plugin-polyfill-corejs3@^0.14.0: + version "0.14.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.2.tgz#6ac08d2f312affb70c4c69c0fbba4cb417ee5587" + integrity sha512-coWpDLJ410R781Npmn/SIBZEsAetR4xVi0SxLMXPaMO4lSf1MwnkGYMtkFxew0Dn8B3/CpbpYxN0JCgg8mn67g== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.6.8" + core-js-compat "^3.48.0" + +babel-plugin-polyfill-regenerator@^0.6.5, babel-plugin-polyfill-regenerator@^0.6.6: + version "0.6.8" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.8.tgz#8a6bfd5dd54239362b3d06ce47ac52b2d95d7721" + integrity sha512-M762rNHfSF1EV3SLtnCJXFoQbbIIz0OyRwnCmV0KPC7qosSfCO0QLTSuJX3ayAebubhE6oYBAYPrBA5ljowaZg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.3" + "@babel/helper-define-polyfill-provider" "^0.6.8" balanced-match@^1.0.0: version "1.0.2" @@ -1544,6 +1567,11 @@ base64id@2.0.0, base64id@~2.0.0: resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== +baseline-browser-mapping@^2.10.42: + version "2.10.43" + resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.43.tgz#7b5d11590ce5acdbe4859443e3c940e81ce8c02d" + integrity sha512-AjYpR78kDWAY3Efj+cDTFH9t9SCoL7OoTp1BOb0mQV7S+6CiLwnWM3FyxhJtdPufDFKzmCSFoUncKjWgJEZTCQ== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -1555,22 +1583,22 @@ binary-extensions@^2.0.0: integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== body-parser@^1.19.0: - version "1.20.3" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" - integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== + version "1.20.6" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.6.tgz#60c789c78e0992d906da0a29d71ae01d15c1ed76" + integrity sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g== dependencies: - bytes "3.1.2" + bytes "~3.1.2" content-type "~1.0.5" debug "2.6.9" depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.13.0" - raw-body "2.5.2" + destroy "~1.2.0" + http-errors "~2.0.1" + iconv-lite "~0.4.24" + on-finished "~2.4.1" + qs "~6.15.1" + raw-body "~2.5.3" type-is "~1.6.18" - unpipe "1.0.0" + unpipe "~1.0.0" bootstrap-select@^1.13.18: version "1.13.18" @@ -1578,22 +1606,22 @@ bootstrap-select@^1.13.18: integrity sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow== bootstrap@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38" - integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg== + version "5.3.8" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed" + integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg== brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + version "1.1.16" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.16.tgz#723d3a30c0558c225abc9fc479a73e14e26c3c2f" + integrity sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== +brace-expansion@^2.0.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.1.2.tgz#0bba2271feb7d458b0d31ad13625aaa4754431e2" + integrity sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA== dependencies: balanced-match "^1.0.0" @@ -1604,27 +1632,28 @@ braces@^3.0.2, braces@^3.0.3, braces@~3.0.2: dependencies: fill-range "^7.1.1" -browserslist@^4.24.0, browserslist@^4.24.4: - version "4.24.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b" - integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A== +browserslist@^4.24.0, browserslist@^4.28.1: + version "4.28.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.6.tgz#7cf83afcd69c55fde6fb2dcc5039ff0f4ba42610" + integrity sha512-FQBYNK15VMslhLHpA7+n+n1GOlF1kId2xcCg7/j95f24AOF6VDYMNH4mFxF7KuaTdv627faazpOAjFzMrfJOUw== dependencies: - caniuse-lite "^1.0.30001688" - electron-to-chromium "^1.5.73" - node-releases "^2.0.19" - update-browserslist-db "^1.1.1" + baseline-browser-mapping "^2.10.42" + caniuse-lite "^1.0.30001803" + electron-to-chromium "^1.5.389" + node-releases "^2.0.51" + update-browserslist-db "^1.2.3" buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -bytes@3.1.2: +bytes@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2: +call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6" integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ== @@ -1632,14 +1661,14 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply- es-errors "^1.3.0" function-bind "^1.1.2" -call-bind@^1.0.7, call-bind@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c" - integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww== +call-bind@^1.0.7, call-bind@^1.0.8, call-bind@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.9.tgz#39a644700c80bc7d0ca9102fc6d1d43b2fd7eee7" + integrity sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ== dependencies: - call-bind-apply-helpers "^1.0.0" - es-define-property "^1.0.0" - get-intrinsic "^1.2.4" + call-bind-apply-helpers "^1.0.2" + es-define-property "^1.0.1" + get-intrinsic "^1.3.0" set-function-length "^1.2.2" call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4: @@ -1655,10 +1684,10 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -caniuse-lite@^1.0.30001688: - version "1.0.30001704" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz#6644fe909d924ac3a7125e8a0ab6af95b1f32990" - integrity sha512-+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew== +caniuse-lite@^1.0.30001803: + version "1.0.30001806" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz#1bc8e502b723fa393455dfbedd5ccec0c29bb74e" + integrity sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw== chalk@^4.0.0: version "4.1.2" @@ -1688,12 +1717,12 @@ chokidar@^3.5.1: optionalDependencies: fsevents "~2.3.2" -chokidar@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30" - integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA== +chokidar@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-5.0.0.tgz#949c126a9238a80792be9a0265934f098af369a5" + integrity sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw== dependencies: - readdirp "^4.0.1" + readdirp "^5.0.0" chrome-trace-event@^1.0.2: version "1.0.4" @@ -1785,22 +1814,22 @@ cookie@~0.7.2: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7" integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w== -core-js-compat@^3.40.0: - version "3.41.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.41.0.tgz#4cdfce95f39a8f27759b667cf693d96e5dda3d17" - integrity sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A== +core-js-compat@^3.43.0, core-js-compat@^3.48.0: + version "3.49.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.49.0.tgz#06145447d92f4aaf258a0c44f24b47afaeaffef6" + integrity sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA== dependencies: - browserslist "^4.24.4" + browserslist "^4.28.1" core-js@^3.6.5: - version "3.41.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.41.0.tgz#57714dafb8c751a6095d028a7428f1fb5834a776" - integrity sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA== + version "3.49.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.49.0.tgz#8b4d520ac034311fa21aa616f017ada0e0dbbddd" + integrity sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg== cors@~2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + version "2.8.6" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.6.tgz#ff5dd69bd95e547503820d29aba4f8faf8dfec96" + integrity sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw== dependencies: object-assign "^4" vary "^1" @@ -1876,17 +1905,10 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: - version "4.4.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" - integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== - dependencies: - ms "^2.1.3" - -debug@~4.3.1, debug@~4.3.2, debug@~4.3.4: - version "4.3.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" - integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== +debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.4.3, debug@~4.4.1: + version "4.4.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" + integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== dependencies: ms "^2.1.3" @@ -1913,20 +1935,20 @@ define-properties@^1.2.1: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -depd@2.0.0: +depd@2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -destroy@1.2.0: +destroy@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== +detect-libc@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad" + integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ== di@^0.0.1: version "0.0.1" @@ -1971,10 +1993,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.5.73: - version "1.5.118" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.118.tgz#064bda9bfea1611074288adb1fdd1f787a131e21" - integrity sha512-yNDUus0iultYyVoEFLnQeei7LOQkL8wg8GQpkPCRrOlJXlcCwa6eGKZkxQ9ciHsqZyYbj8Jd94X1CTPzGm+uIA== +electron-to-chromium@^1.5.389: + version "1.5.393" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.393.tgz#aec971df2a6f4f7e51fbacb200d66cebfc7d3c17" + integrity sha512-kiDJdIUawuEIcp9XoICKp1iTYDEbgguIPq526N1Q7jIQDeQ3CqoMx71025PI/7E48Ddtw2HuWsVjY7afEgNxmg== emoji-regex@^8.0.0: version "8.0.0" @@ -1997,27 +2019,28 @@ engine.io-parser@~5.2.1: integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q== engine.io@~6.6.0: - version "6.6.4" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.4.tgz#0a89a3e6b6c1d4b0c2a2a637495e7c149ec8d8ee" - integrity sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g== + version "6.6.9" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.9.tgz#fd17e9f4e3a256423592574b60ac262e91af4b82" + integrity sha512-clKkw4C7nJ22mGgoVcCg6V/W/TxdNyIOTr89k2ONZu81qqkddPFDF0LXcbAwhzPD8DjkiRCjzuiO6Y+fkpD4vg== dependencies: "@types/cors" "^2.8.12" "@types/node" ">=10.0.0" + "@types/ws" "^8.5.12" accepts "~1.3.4" base64id "2.0.0" cookie "~0.7.2" cors "~2.8.5" - debug "~4.3.1" + debug "~4.4.1" engine.io-parser "~5.2.1" - ws "~8.17.1" + ws "~8.21.0" -enhanced-resolve@^5.17.1: - version "5.18.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf" - integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg== +enhanced-resolve@^5.22.2: + version "5.24.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.24.2.tgz#f25d703a24431cb1e02f944adb74aefa4fcb8d7e" + integrity sha512-rpsZEGT1jFuve6QlpyRp9ckQ+kN61hvF9BzCPyMdaKTm8UJce96KBn3sorXOFXlzjPrs3Vc4T1NsSroZ3PxlFw== dependencies: graceful-fs "^4.2.4" - tapable "^2.2.0" + tapable "^2.3.3" ent@~2.2.0: version "2.2.2" @@ -2030,38 +2053,48 @@ ent@~2.2.0: safe-regex-test "^1.1.0" envinfo@^7.7.3: - version "7.14.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.14.0.tgz#26dac5db54418f2a4c1159153a0b2ae980838aae" - integrity sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg== + version "7.21.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.21.0.tgz#04a251be79f92548541f37d13c8b6f22940c3bae" + integrity sha512-Lw7I8Zp5YKHFCXL7+Dz95g4CcbMEpgvqZNNq3AmlT5XAV6CgAAk6gyAMqn2zjw08K9BHfcNuKrMiCPLByGafow== error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + version "1.3.4" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414" + integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ== dependencies: is-arrayish "^0.2.1" -es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9: - version "1.23.9" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606" - integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA== +es-abstract-get@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-abstract-get/-/es-abstract-get-1.0.0.tgz#1eae87101f42bedeb6a740e8c5051271aef89088" + integrity sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg== + dependencies: + es-errors "^1.3.0" + es-object-atoms "^1.1.2" + is-callable "^1.2.7" + object-inspect "^1.13.4" + +es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9, es-abstract@^1.24.0, es-abstract@^1.24.2: + version "1.24.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.2.tgz#2dbd38c180735ee983f77585140a2706a963ed9a" + integrity sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg== dependencies: array-buffer-byte-length "^1.0.2" arraybuffer.prototype.slice "^1.0.4" available-typed-arrays "^1.0.7" call-bind "^1.0.8" - call-bound "^1.0.3" + call-bound "^1.0.4" data-view-buffer "^1.0.2" data-view-byte-length "^1.0.2" data-view-byte-offset "^1.0.1" es-define-property "^1.0.1" es-errors "^1.3.0" - es-object-atoms "^1.0.0" + es-object-atoms "^1.1.1" es-set-tostringtag "^2.1.0" es-to-primitive "^1.3.0" function.prototype.name "^1.1.8" - get-intrinsic "^1.2.7" - get-proto "^1.0.0" + get-intrinsic "^1.3.0" + get-proto "^1.0.1" get-symbol-description "^1.1.0" globalthis "^1.0.4" gopd "^1.2.0" @@ -2073,21 +2106,24 @@ es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9: is-array-buffer "^3.0.5" is-callable "^1.2.7" is-data-view "^1.0.2" + is-negative-zero "^2.0.3" is-regex "^1.2.1" + is-set "^2.0.3" is-shared-array-buffer "^1.0.4" is-string "^1.1.1" is-typed-array "^1.1.15" - is-weakref "^1.1.0" + is-weakref "^1.1.1" math-intrinsics "^1.1.0" - object-inspect "^1.13.3" + object-inspect "^1.13.4" object-keys "^1.1.1" object.assign "^4.1.7" own-keys "^1.0.1" - regexp.prototype.flags "^1.5.3" + regexp.prototype.flags "^1.5.4" safe-array-concat "^1.1.3" safe-push-apply "^1.0.0" safe-regex-test "^1.1.0" set-proto "^1.0.0" + stop-iteration-iterator "^1.1.0" string.prototype.trim "^1.2.10" string.prototype.trimend "^1.0.9" string.prototype.trimstart "^1.0.8" @@ -2096,7 +2132,7 @@ es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9: typed-array-byte-offset "^1.0.4" typed-array-length "^1.0.7" unbox-primitive "^1.1.0" - which-typed-array "^1.1.18" + which-typed-array "^1.1.19" es-define-property@^1.0.0, es-define-property@^1.0.1: version "1.0.1" @@ -2108,15 +2144,15 @@ es-errors@^1.3.0: resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -es-module-lexer@^1.2.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.6.0.tgz#da49f587fd9e68ee2404fe4e256c0c7d3a81be21" - integrity sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ== +es-module-lexer@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-2.3.1.tgz#5bf2df06999dbbe5f006a5f46a11fb9f5b7b391b" + integrity sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA== -es-object-atoms@^1.0.0, es-object-atoms@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1" - integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA== +es-object-atoms@^1.0.0, es-object-atoms@^1.1.1, es-object-atoms@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.2.tgz#a2d0b373205724dfa525d23b0c3e1b1ca582c99b" + integrity sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw== dependencies: es-errors "^1.3.0" @@ -2138,13 +2174,16 @@ es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0: hasown "^2.0.2" es-to-primitive@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18" - integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g== + version "1.3.4" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.4.tgz#0c854291cf0d7b439d6b9e5771ea837ffaf1f991" + integrity sha512-yPDz7wqpg1/mmHLmS3tcfTfbw5f1eryXvyghYBffGdERwe+mV7ZcWzTR8LR17Kvqt3qfPurjlonmnq3MKXIOXw== dependencies: + es-abstract-get "^1.0.0" + es-define-property "^1.0.1" + es-errors "^1.3.0" is-callable "^1.2.7" - is-date-object "^1.0.5" - is-symbol "^1.0.4" + is-date-object "^1.1.0" + is-symbol "^1.1.1" escalade@^3.1.1, escalade@^3.2.0: version "3.2.0" @@ -2172,44 +2211,44 @@ eslint-config-airbnb-base@^15.0.0: semver "^6.3.0" eslint-import-resolver-node@^0.3.9: - version "0.3.9" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" - integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== + version "0.3.10" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.10.tgz#84ce3005abfc300588cf23bbac1aabec1fc6e8c1" + integrity sha512-tRrKqFyCaKict5hOd244sL6EQFNycnMQnBe+j8uqGNXYzsImGbGUU4ibtoaBmv5FLwJwcFJNeg1GeVjQfbMrDQ== dependencies: debug "^3.2.7" - is-core-module "^2.13.0" - resolve "^1.22.4" + is-core-module "^2.16.1" + resolve "^2.0.0-next.6" -eslint-module-utils@^2.12.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b" - integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg== +eslint-module-utils@^2.12.1: + version "2.14.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.14.0.tgz#611f8e1c6ceb29a93eb949e1cc670b8287764819" + integrity sha512-W2WCRZ9Dqntd+2u8jJcVMV2PKulc6RdLgUUoh/yQr3uB6lo/ZOeGx11sv60/8S4QFFKNslAlWhr9u0Ef7ZW6Ig== dependencies: debug "^3.2.7" eslint-plugin-import@^2.26.0: - version "2.31.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7" - integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A== + version "2.32.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980" + integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA== dependencies: "@rtsao/scc" "^1.1.0" - array-includes "^3.1.8" - array.prototype.findlastindex "^1.2.5" - array.prototype.flat "^1.3.2" - array.prototype.flatmap "^1.3.2" + array-includes "^3.1.9" + array.prototype.findlastindex "^1.2.6" + array.prototype.flat "^1.3.3" + array.prototype.flatmap "^1.3.3" debug "^3.2.7" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.9" - eslint-module-utils "^2.12.0" + eslint-module-utils "^2.12.1" hasown "^2.0.2" - is-core-module "^2.15.1" + is-core-module "^2.16.1" is-glob "^4.0.3" minimatch "^3.1.2" object.fromentries "^2.0.8" object.groupby "^1.0.3" - object.values "^1.2.0" + object.values "^1.2.1" semver "^6.3.1" - string.prototype.trimend "^1.0.8" + string.prototype.trimend "^1.0.9" tsconfig-paths "^3.15.0" eslint-scope@5.1.1: @@ -2299,9 +2338,9 @@ espree@^9.6.0, espree@^9.6.1: eslint-visitor-keys "^3.4.1" esquery@^1.4.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7" - integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg== + version "1.7.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d" + integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g== dependencies: estraverse "^5.1.0" @@ -2358,9 +2397,9 @@ fast-levenshtein@^2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fast-uri@^3.0.1: - version "3.0.6" - resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.6.tgz#88f130b77cfaea2378d56bf970dea21257a68748" - integrity sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw== + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.3.tgz#f695a40f006aba505631573a0021ddb21194ad11" + integrity sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg== fastest-levenshtein@^1.0.12: version "1.0.16" @@ -2368,9 +2407,9 @@ fastest-levenshtein@^1.0.12: integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.19.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5" - integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ== + version "1.20.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.20.1.tgz#ca750a10dc925bc8b18839fd203e3ef4b3ced675" + integrity sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw== dependencies: reusify "^1.0.4" @@ -2448,14 +2487,14 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.2.7, flatted@^3.2.9: - version "3.3.3" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358" - integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg== + version "3.4.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726" + integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA== follow-redirects@^1.0.0: - version "1.15.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" - integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== + version "1.16.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.0.tgz#28474a159d3b9d11ef62050a14ed60e4df6d61bc" + integrity sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw== for-each@^0.3.3, for-each@^0.3.5: version "0.3.5" @@ -2489,22 +2528,30 @@ function-bind@^1.1.2: integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== function.prototype.name@^1.1.6, function.prototype.name@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78" - integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.2.0.tgz#758f3e84fa542672454bd5e14cb081a5ce07f70c" + integrity sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew== dependencies: - call-bind "^1.0.8" - call-bound "^1.0.3" - define-properties "^1.2.1" + call-bind "^1.0.9" + call-bound "^1.0.4" + es-define-property "^1.0.1" + es-errors "^1.3.0" functions-have-names "^1.2.3" - hasown "^2.0.2" + has-property-descriptors "^1.0.2" + hasown "^2.0.4" is-callable "^1.2.7" + is-document.all "^1.0.0" functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== +generator-function@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2" + integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g== + gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -2531,7 +2578,7 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@ hasown "^2.0.2" math-intrinsics "^1.1.0" -get-proto@^1.0.0, get-proto@^1.0.1: +get-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1" integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g== @@ -2562,11 +2609,6 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - glob@^7.1.3, glob@^7.1.6, glob@^7.1.7: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -2579,11 +2621,6 @@ glob@^7.1.3, glob@^7.1.6, glob@^7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - globals@^13.19.0: version "13.24.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" @@ -2650,23 +2687,23 @@ has-tostringtag@^1.0.2: dependencies: has-symbols "^1.0.3" -hasown@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" - integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== +hasown@^2.0.2, hasown@^2.0.3, hasown@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.4.tgz#8c62d8cb90beb2aad5d0a5b67581ad9854c3f003" + integrity sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A== dependencies: function-bind "^1.1.2" -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== +http-errors@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b" + integrity sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ== dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" + depd "~2.0.0" + inherits "~2.0.4" + setprototypeof "~1.2.0" + statuses "~2.0.2" + toidentifier "~1.0.1" http-proxy@^1.18.1: version "1.18.1" @@ -2677,7 +2714,7 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" -iconv-lite@0.4.24: +iconv-lite@~0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -2689,10 +2726,10 @@ ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== -immutable@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.3.tgz#aa037e2313ea7b5d400cd9298fa14e404c933db1" - integrity sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw== +immutable@^5.1.5: + version "5.1.9" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.9.tgz#ac23c3a01992ab665e14ac9ffff298f28cd74a0c" + integrity sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg== import-fresh@^3.2.1: version "3.3.1" @@ -2723,7 +2760,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4: +inherits@2, inherits@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2794,12 +2831,12 @@ is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.16.0: - version "2.16.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4" - integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w== +is-core-module@^2.16.1, is-core-module@^2.16.2: + version "2.16.2" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.2.tgz#3e07450a8080ebce3fbf0cac494f4d2ab324e082" + integrity sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA== dependencies: - hasown "^2.0.2" + hasown "^2.0.3" is-data-view@^1.0.1, is-data-view@^1.0.2: version "1.0.2" @@ -2810,7 +2847,7 @@ is-data-view@^1.0.1, is-data-view@^1.0.2: get-intrinsic "^1.2.6" is-typed-array "^1.1.13" -is-date-object@^1.0.5, is-date-object@^1.1.0: +is-date-object@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7" integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg== @@ -2818,6 +2855,13 @@ is-date-object@^1.0.5, is-date-object@^1.1.0: call-bound "^1.0.2" has-tostringtag "^1.0.2" +is-document.all@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-document.all/-/is-document.all-1.0.0.tgz#163a4bfb362c6ed7b118ce46cdecc4e37dee3195" + integrity sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g== + dependencies: + call-bound "^1.0.4" + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -2836,12 +2880,13 @@ is-fullwidth-code-point@^3.0.0: integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-generator-function@^1.0.10: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca" - integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5" + integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA== dependencies: - call-bound "^1.0.3" - get-proto "^1.0.0" + call-bound "^1.0.4" + generator-function "^2.0.0" + get-proto "^1.0.1" has-tostringtag "^1.0.2" safe-regex-test "^1.1.0" @@ -2857,6 +2902,11 @@ is-map@^2.0.3: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== +is-negative-zero@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== + is-number-object@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541" @@ -2904,7 +2954,7 @@ is-shared-array-buffer@^1.0.4: dependencies: call-bound "^1.0.3" -is-string@^1.0.7, is-string@^1.1.1: +is-string@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9" integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA== @@ -2912,7 +2962,7 @@ is-string@^1.0.7, is-string@^1.1.1: call-bound "^1.0.3" has-tostringtag "^1.0.2" -is-symbol@^1.0.4, is-symbol@^1.1.1: +is-symbol@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634" integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w== @@ -2933,7 +2983,7 @@ is-weakmap@^2.0.2: resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== -is-weakref@^1.0.2, is-weakref@^1.1.0: +is-weakref@^1.0.2, is-weakref@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293" integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew== @@ -2995,22 +3045,22 @@ jquery-ui-sass@^0.0.1: resolved "https://registry.yarnpkg.com/jquery-ui-sass/-/jquery-ui-sass-0.0.1.tgz#d117eb1a82fbf5072e6797e370c21b2446fb0861" integrity sha512-O+59acNrMie/z/5xZghZ/JJ2cs2MUX1oUXP/z5ukyJuub4RKWrt34MywoYH9VECcduT39c8PgRR1YXbEy/A0Ng== -jquery-ui@^1.12.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.14.1.tgz#ba342ea3ffff662b787595391f607d923313e040" - integrity sha512-DhzsYH8VeIvOaxwi+B/2BCsFFT5EGjShdzOcm5DssWjtcpGWIMsn66rJciDA6jBruzNiLf1q0KvwMoX1uGNvnQ== +jquery-ui@1.13.3: + version "1.13.3" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.3.tgz#d9f5292b2857fa1f2fdbbe8f2e66081664eb9bc5" + integrity sha512-D2YJfswSJRh/B8M/zCowDpNFfwsDmtfnMPwjJTyvl+CBqzpYwQ+gFYIbUUlzijy/Qvoy30H1YhoSui4MNYpRwA== dependencies: - jquery ">=1.12.0 <5.0.0" + jquery ">=1.8.0 <4.0.0" -"jquery@>=1.12.0 <5.0.0", jquery@^3.5.1: +"jquery@>=1.8.0 <4.0.0", jquery@^3.5.1: version "3.7.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== js-cookie@^3.0.1: - version "3.0.5" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc" - integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw== + version "3.0.8" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.8.tgz#444e6f4b27a5d844594fef61c9d6bca5f0787688" + integrity sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw== js-tokens@^4.0.0: version "4.0.0" @@ -3018,28 +3068,23 @@ js-tokens@^4.0.0: integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.0.tgz#d1900572a7f7cf0b5f540c83673e60bad3436592" + integrity sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q== dependencies: argparse "^2.0.1" -jsesc@^3.0.2: +jsesc@^3.0.2, jsesc@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== -jsesc@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" - integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== - json-buffer@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: +json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -3181,10 +3226,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== +loader-runner@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.2.tgz#9913d3a15971f8f635915e601fb5c9d495d918e9" + integrity sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w== loader-utils@^1.1.0: version "1.4.2" @@ -3232,9 +3277,9 @@ lodash.merge@^4.6.2: integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash@^4.17.15, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + version "4.18.1" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c" + integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q== log4js@^6.4.1: version "6.9.1" @@ -3282,7 +3327,12 @@ mime-db@1.52.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34: +mime-db@^1.54.0: + version "1.54.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5" + integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ== + +mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -3295,24 +3345,34 @@ mime@^2.5.2: integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e" + integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w== dependencies: brace-expansion "^1.1.7" minimatch@^9.0.3: - version "9.0.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" - integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== + version "9.0.9" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.9.tgz#9b0cb9fcb78087f6fd7eababe2511c4d3d60574e" + integrity sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg== dependencies: - brace-expansion "^2.0.1" + brace-expansion "^2.0.2" minimist@^1.2.0, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== +minimizer-webpack-plugin@^5.6.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz#289922a4c96c4ed1ddb76b8a00bd8074e89a2f7f" + integrity sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw== + dependencies: + "@jridgewell/trace-mapping" "^0.3.25" + jest-worker "^27.4.5" + schema-utils "^4.3.0" + terser "^5.31.1" + mkdirp@^0.5.5: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -3350,10 +3410,20 @@ node-addon-api@^7.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== -node-releases@^2.0.19: - version "2.0.19" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314" - integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw== +node-exports-info@^1.6.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/node-exports-info/-/node-exports-info-1.6.2.tgz#243a3105677d6781cd26e6a72350fd928a5cb46f" + integrity sha512-kXs9Go0cah0qHVV2v389IXQLdLCeE1xfFtjOAF+iobu0OIoG1pje8At2vMHyaPMiPMnG/LWP50twML21eMcAag== + dependencies: + array.prototype.flatmap "^1.3.3" + es-errors "^1.3.0" + object.entries "^1.1.9" + semver "^6.3.1" + +node-releases@^2.0.51: + version "2.0.51" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.51.tgz#cdc08433577f5b32ad01694481726e22eeb54aef" + integrity sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -3370,7 +3440,7 @@ object-assign@^4: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.13.3: +object-inspect@^1.13.3, object-inspect@^1.13.4: version "1.13.4" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213" integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew== @@ -3392,14 +3462,15 @@ object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.7: has-symbols "^1.1.0" object-keys "^1.1.1" -object.entries@^1.1.5: - version "1.1.8" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41" - integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ== +object.entries@^1.1.5, object.entries@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz#e4770a6a1444afb61bd39f984018b5bede25f8b3" + integrity sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.4" define-properties "^1.2.1" - es-object-atoms "^1.0.0" + es-object-atoms "^1.1.1" object.fromentries@^2.0.8: version "2.0.8" @@ -3420,7 +3491,7 @@ object.groupby@^1.0.3: define-properties "^1.2.1" es-abstract "^1.23.2" -object.values@^1.2.0: +object.values@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216" integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA== @@ -3430,13 +3501,6 @@ object.values@^1.2.0: define-properties "^1.2.1" es-object-atoms "^1.0.0" -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -3444,6 +3508,13 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" +on-finished@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== + dependencies: + ee-first "1.1.1" + once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -3571,15 +3642,20 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -picocolors@^1.0.0, picocolors@^1.1.1: +picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + version "2.3.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601" + integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA== + +picomatch@^4.0.3: + version "4.0.5" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.5.tgz#51ea57a17d86f605f81039595fbc40ed06a55fab" + integrity sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A== pkg-dir@^4.2.0: version "4.2.0" @@ -3595,7 +3671,7 @@ pkg-dir@^7.0.0: dependencies: find-up "^6.3.0" -possible-typed-array-names@^1.0.0: +possible-typed-array-names@^1.0.0, possible-typed-array-names@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae" integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg== @@ -3620,12 +3696,13 @@ qjobs@^1.2.0: resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== -qs@6.13.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" - integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== +qs@~6.15.1: + version "6.15.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.15.3.tgz#76852132a58ed5c7c0ef67e4441b9bb5d6061b3b" + integrity sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A== dependencies: - side-channel "^1.0.6" + es-define-property "^1.0.1" + side-channel "^1.1.1" queue-microtask@^1.2.2: version "1.2.3" @@ -3640,32 +3717,25 @@ rails-erb-loader@^5.5.2: loader-utils "^1.1.0" lodash.defaults "^4.2.0" -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - range-parser@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + version "1.3.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.3.0.tgz#d7f19be812bb62721472b45d3be219ef09572b47" + integrity sha512-hek2mFQpPuI4E1BBKrSto+BU3e3x4xuarsbiwr3+lf7p44juvFMV0XFWQAP3xUyqXA4RrXLIoaSUGbSt056ZMw== -raw-body@2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" - integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== +raw-body@~2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.3.tgz#11c6650ee770a7de1b494f197927de0c923822e2" + integrity sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA== dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" + bytes "~3.1.2" + http-errors "~2.0.1" + iconv-lite "~0.4.24" + unpipe "~1.0.0" -readdirp@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d" - integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg== +readdirp@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-5.0.0.tgz#fbf1f71a727891d685bb1786f9ba74084f6e2f91" + integrity sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ== readdirp@~3.6.0: version "3.6.0" @@ -3681,7 +3751,7 @@ rechoir@^0.8.0: dependencies: resolve "^1.20.0" -reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9: +reflect.getprototypeof@^1.0.10, reflect.getprototypeof@^1.0.9: version "1.0.10" resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9" integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw== @@ -3695,10 +3765,10 @@ reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9: get-proto "^1.0.1" which-builtin-type "^1.2.1" -regenerate-unicode-properties@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0" - integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA== +regenerate-unicode-properties@^10.2.2: + version "10.2.2" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz#aa113812ba899b630658c7623466be71e1f86f66" + integrity sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g== dependencies: regenerate "^1.4.2" @@ -3712,19 +3782,7 @@ regenerator-runtime@^0.13.5: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regenerator-runtime@^0.14.0: - version "0.14.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" - integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== - -regenerator-transform@^0.15.2: - version "0.15.2" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4" - integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg== - dependencies: - "@babel/runtime" "^7.8.4" - -regexp.prototype.flags@^1.5.3: +regexp.prototype.flags@^1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19" integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA== @@ -3736,29 +3794,29 @@ regexp.prototype.flags@^1.5.3: gopd "^1.2.0" set-function-name "^2.0.2" -regexpu-core@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826" - integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA== +regexpu-core@^6.3.1: + version "6.4.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.4.0.tgz#3580ce0c4faedef599eccb146612436b62a176e5" + integrity sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA== dependencies: regenerate "^1.4.2" - regenerate-unicode-properties "^10.2.0" + regenerate-unicode-properties "^10.2.2" regjsgen "^0.8.0" - regjsparser "^0.12.0" + regjsparser "^0.13.0" unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.1.0" + unicode-match-property-value-ecmascript "^2.2.1" regjsgen@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab" integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q== -regjsparser@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc" - integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ== +regjsparser@^0.13.0: + version "0.13.2" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.13.2.tgz#f654734b5c588b22ba3e21693b30523417180808" + integrity sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ== dependencies: - jsesc "~3.0.2" + jsesc "~3.1.0" require-directory@^2.1.1: version "2.1.1" @@ -3792,12 +3850,25 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.4: - version "1.22.10" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39" - integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w== +resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.11: + version "1.22.12" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.12.tgz#f5b2a680897c69c238a13cd16b15671f8b73549f" + integrity sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA== + dependencies: + es-errors "^1.3.0" + is-core-module "^2.16.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^2.0.0-next.6: + version "2.0.0-next.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.7.tgz#ba3b035d4b1ee7c522426eee73cabcb0fd5515dd" + integrity sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ== dependencies: - is-core-module "^2.16.0" + es-errors "^1.3.0" + is-core-module "^2.16.2" + node-exports-info "^1.6.0" + object-keys "^1.1.1" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -3826,21 +3897,16 @@ run-parallel@^1.1.9: queue-microtask "^1.2.2" safe-array-concat@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3" - integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q== + version "1.1.4" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.4.tgz#a54cc9b61a57f33b42abad3cbdda3a2b38cc5719" + integrity sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg== dependencies: - call-bind "^1.0.8" - call-bound "^1.0.2" - get-intrinsic "^1.2.6" + call-bind "^1.0.9" + call-bound "^1.0.4" + get-intrinsic "^1.3.0" has-symbols "^1.1.0" isarray "^2.0.5" -safe-buffer@^5.1.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - safe-push-apply@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5" @@ -3864,12 +3930,12 @@ safe-regex-test@^1.1.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sass@^1.57.1: - version "1.85.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.85.1.tgz#18ab0bb48110ae99163778f06445b406148ca0d5" - integrity sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag== + version "1.101.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.101.0.tgz#c2db5bbf2f956be7277f6223b899d0d4be3c899b" + integrity sha512-OL3GoQyoUdDt843DpVmDO6y2k1sc5IhUDSpu8XucEI+35neq5QivZ1iuegnpraEVTJXlQGK1gl27zKcTLEPbQw== dependencies: - chokidar "^4.0.0" - immutable "^5.0.2" + chokidar "^5.0.0" + immutable "^5.1.5" source-map-js ">=0.6.2 <2.0.0" optionalDependencies: "@parcel/watcher" "^2.4.1" @@ -3883,10 +3949,10 @@ schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" -schema-utils@^4.0.0, schema-utils@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0" - integrity sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g== +schema-utils@^4.0.0, schema-utils@^4.3.0, schema-utils@^4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.3.tgz#5b1850912fa31df90716963d45d9121fdfc09f46" + integrity sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA== dependencies: "@types/json-schema" "^7.0.9" ajv "^8.9.0" @@ -3898,13 +3964,6 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -serialize-javascript@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" - integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== - dependencies: - randombytes "^2.1.0" - set-function-length@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" @@ -3936,7 +3995,7 @@ set-proto@^1.0.0: es-errors "^1.3.0" es-object-atoms "^1.0.0" -setprototypeof@1.2.0: +setprototypeof@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== @@ -3960,13 +4019,13 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -side-channel-list@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad" - integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA== +side-channel-list@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127" + integrity sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w== dependencies: es-errors "^1.3.0" - object-inspect "^1.13.3" + object-inspect "^1.13.4" side-channel-map@^1.0.1: version "1.0.1" @@ -3989,42 +4048,42 @@ side-channel-weakmap@^1.0.2: object-inspect "^1.13.3" side-channel-map "^1.0.1" -side-channel@^1.0.6, side-channel@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9" - integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw== +side-channel@^1.1.0, side-channel@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.1.tgz#ea02c62e05dc4bea67d4442f0fb71ee192f8e0ab" + integrity sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ== dependencies: es-errors "^1.3.0" - object-inspect "^1.13.3" - side-channel-list "^1.0.0" + object-inspect "^1.13.4" + side-channel-list "^1.0.1" side-channel-map "^1.0.1" side-channel-weakmap "^1.0.2" socket.io-adapter@~2.5.2: - version "2.5.5" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz#c7a1f9c703d7756844751b6ff9abfc1780664082" - integrity sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg== + version "2.5.8" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.8.tgz#c9fcabf602dbd5b09258ca98e5ec6a7ae4360698" + integrity sha512-6Oy52pbg+kvdCVvjcN+FnY7BvxZ7cIHNScbvztT/It5d0vbwoJoVZmF2gjJmnV0/4WlXRfG15zc45ySk9Ah8bw== dependencies: - debug "~4.3.4" - ws "~8.17.1" + debug "~4.4.1" + ws "~8.21.0" socket.io-parser@~4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83" - integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew== + version "4.2.7" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.7.tgz#679e51fe24d1c81df90fc5f7efe4a5f432fe99c0" + integrity sha512-IH/iSeO9T6gz1KkFleGDWkG9N3dl4jXVYUtMhIqH10Md0ttMer8nUNWiP1DKuNrybD2xBrixLJdCC9J6ECoYkg== dependencies: "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" + debug "~4.4.1" socket.io@^4.7.2: - version "4.8.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.1.tgz#fa0eaff965cc97fdf4245e8d4794618459f7558a" - integrity sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg== + version "4.8.3" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.3.tgz#ca6ba1431c69532e1e0a6f496deebeb601dbc4df" + integrity sha512-2Dd78bqzzjE6KPkD5fHZmDAKRNe3J15q+YHDrIsy9WEkqttc7GY+kT9OBLSMaPbQaEd0x1BjcmtMtXkfpc+T5A== dependencies: accepts "~1.3.4" base64id "~2.0.0" cors "~2.8.5" - debug "~4.3.2" + debug "~4.4.1" engine.io "~6.6.0" socket.io-adapter "~2.5.2" socket.io-parser "~4.2.4" @@ -4052,16 +4111,24 @@ spark-md5@^3.0.1: resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== +statuses@~2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382" + integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw== + +stop-iteration-iterator@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad" + integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ== + dependencies: + es-errors "^1.3.0" + internal-slot "^1.1.0" + streamroller@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff" @@ -4081,27 +4148,28 @@ string-width@^4.1.0, string-width@^4.2.0: strip-ansi "^6.0.1" string.prototype.trim@^1.2.10: - version "1.2.10" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81" - integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA== + version "1.2.11" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz#e6bd19cda3985d05a42dda31f3ddf4d35d3430e3" + integrity sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w== dependencies: - call-bind "^1.0.8" - call-bound "^1.0.2" + call-bind "^1.0.9" + call-bound "^1.0.4" define-data-property "^1.1.4" define-properties "^1.2.1" - es-abstract "^1.23.5" - es-object-atoms "^1.0.0" + es-abstract "^1.24.2" + es-object-atoms "^1.1.2" has-property-descriptors "^1.0.2" + safe-regex-test "^1.1.0" -string.prototype.trimend@^1.0.8, string.prototype.trimend@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942" - integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ== +string.prototype.trimend@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.10.tgz#be6bcf4f3fe0460bdeccdb2cf4f971b310f8346e" + integrity sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw== dependencies: - call-bind "^1.0.8" - call-bound "^1.0.2" + call-bind "^1.0.9" + call-bound "^1.0.4" define-properties "^1.2.1" - es-object-atoms "^1.0.0" + es-object-atoms "^1.1.2" string.prototype.trimstart@^1.0.8: version "1.0.8" @@ -4148,29 +4216,18 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -terser-webpack-plugin@^5.3.11: - version "5.3.14" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz#9031d48e57ab27567f02ace85c7d690db66c3e06" - integrity sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw== - dependencies: - "@jridgewell/trace-mapping" "^0.3.25" - jest-worker "^27.4.5" - schema-utils "^4.3.0" - serialize-javascript "^6.0.2" - terser "^5.31.1" +tapable@^2.3.0, tapable@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.3.tgz#5da7c9992c46038221267985ab28421a8879f160" + integrity sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A== terser@^5.31.1: - version "5.39.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.39.0.tgz#0e82033ed57b3ddf1f96708d123cca717d86ca3a" - integrity sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw== + version "5.49.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.49.0.tgz#30b341fdf70cfc98486965125ae660fda8403670" + integrity sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA== dependencies: "@jridgewell/source-map" "^0.3.3" - acorn "^8.8.2" + acorn "^8.15.0" commander "^2.20.0" source-map-support "~0.5.20" @@ -4185,14 +4242,14 @@ timeago.js@^4.0.2: integrity sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w== tinymce@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.2.0.tgz#c5015567e742093b43186400c3e7c8394b90cc1f" - integrity sha512-R460NlE4REIFuLcZd9mpHK8zRsHdOueLV2m6Wsn0JHfGhDWMcfB1IqUX2QGrSbJga93ygJbJbNMwb2sakFlE/g== + version "7.9.3" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.9.3.tgz#74f0a04bdf662f90910512d3fe792f0d5f1111e3" + integrity sha512-Mtm54U5YJ6Pyo/GaAx+JSHXTGEuxrg2AowVWCD9zy1eBolp5Ub7S1rTtsyQdxhPegfhLuR3VLiTKGw1tacv09g== tmp@^0.2.1: - version "0.2.5" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8" - integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow== + version "0.2.7" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059" + integrity sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw== to-regex-range@^5.0.1: version "5.0.1" @@ -4201,7 +4258,7 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -toidentifier@1.0.1: +toidentifier@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== @@ -4270,21 +4327,21 @@ typed-array-byte-offset@^1.0.4: reflect.getprototypeof "^1.0.9" typed-array-length@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d" - integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg== + version "1.0.8" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.8.tgz#0b70e982c9e9dafe2def6d6458ff4b3f2d2b6d70" + integrity sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g== dependencies: - call-bind "^1.0.7" - for-each "^0.3.3" - gopd "^1.0.1" - is-typed-array "^1.1.13" - possible-typed-array-names "^1.0.0" - reflect.getprototypeof "^1.0.6" + call-bind "^1.0.9" + for-each "^0.3.5" + gopd "^1.2.0" + is-typed-array "^1.1.15" + possible-typed-array-names "^1.1.0" + reflect.getprototypeof "^1.0.10" ua-parser-js@^0.7.30: - version "0.7.40" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.40.tgz#c87d83b7bb25822ecfa6397a0da5903934ea1562" - integrity sha512-us1E3K+3jJppDBa3Tl0L3MOJiGhe1C6P0+nIvQAFYbxlMAx0h81eOwLmU57xgqToduDDPx3y5QsdjPfDu+FgOQ== + version "0.7.41" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.41.tgz#9f6dee58c389e8afababa62a4a2dc22edb69a452" + integrity sha512-O3oYyCMPYgNNHuO7Jjk3uacJWZF8loBgwrfd/5LE/HyZ3lUIOdniQ7DNXJcIgZbwioZxk0fLfI4EVnetdiX5jg== unbox-primitive@^1.1.0: version "1.1.0" @@ -4296,10 +4353,10 @@ unbox-primitive@^1.1.0: has-symbols "^1.1.0" which-boxed-primitive "^1.1.1" -undici-types@~6.20.0: - version "6.20.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" - integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== +undici-types@~8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-8.3.0.tgz#44e9fc9f3244648cdea35e4f9bb2d681e9410809" + integrity sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ== unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.1" @@ -4314,30 +4371,30 @@ unicode-match-property-ecmascript@^2.0.0: unicode-canonical-property-names-ecmascript "^2.0.0" unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71" - integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg== +unicode-match-property-value-ecmascript@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz#65a7adfad8574c219890e219285ce4c64ed67eaa" + integrity sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg== unicode-property-aliases-ecmascript@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" - integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== + version "2.2.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz#301d4f8a43d2b75c97adfad87c9dd5350c9475d1" + integrity sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ== universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -update-browserslist-db@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420" - integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw== +update-browserslist-db@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d" + integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w== dependencies: escalade "^3.2.0" picocolors "^1.1.1" @@ -4364,12 +4421,11 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== -watchpack@^2.4.1: - version "2.4.2" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" - integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== +watchpack@^2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.5.2.tgz#e12e82d84674266fc1c6dbfe38891b92ff0522ec" + integrity sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg== dependencies: - glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" webpack-cli@^5.0.1: @@ -4407,39 +4463,38 @@ webpack-merge@^5.7.3: flat "^5.0.2" wildcard "^2.0.0" -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== +webpack-sources@^3.5.0: + version "3.5.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.5.1.tgz#76c2418486dcc02b2aa0694c104176c2858fe84a" + integrity sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw== webpack@^5.75.0: - version "5.98.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.98.0.tgz#44ae19a8f2ba97537978246072fb89d10d1fbd17" - integrity sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA== + version "5.108.4" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.108.4.tgz#141818a411662773a0bb32dc5536acc5409943b7" + integrity sha512-yur8LyJoeiWh47dErD+Ok7vlbmDsJ3UbbRPAoxbGJ54WpE2y5yVo5G/inUzujnYgw3tPmBRdn+G7PoxXaYC33w== dependencies: - "@types/eslint-scope" "^3.7.7" - "@types/estree" "^1.0.6" + "@types/estree" "^1.0.8" + "@types/json-schema" "^7.0.15" "@webassemblyjs/ast" "^1.14.1" "@webassemblyjs/wasm-edit" "^1.14.1" "@webassemblyjs/wasm-parser" "^1.14.1" - acorn "^8.14.0" - browserslist "^4.24.0" + acorn "^8.16.0" + acorn-import-phases "^1.0.3" + browserslist "^4.28.1" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.1" - es-module-lexer "^1.2.1" + enhanced-resolve "^5.22.2" + es-module-lexer "^2.1.0" eslint-scope "5.1.1" events "^3.2.0" - glob-to-regexp "^0.4.1" graceful-fs "^4.2.11" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" + loader-runner "^4.3.2" + mime-db "^1.54.0" + minimizer-webpack-plugin "^5.6.1" neo-async "^2.6.2" - schema-utils "^4.3.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.3.11" - watchpack "^2.4.1" - webpack-sources "^3.2.3" + schema-utils "^4.3.3" + tapable "^2.3.0" + watchpack "^2.5.2" + webpack-sources "^3.5.0" which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1: version "1.1.1" @@ -4481,13 +4536,13 @@ which-collection@^1.0.2: is-weakmap "^2.0.2" is-weakset "^2.0.3" -which-typed-array@^1.1.16, which-typed-array@^1.1.18: - version "1.1.19" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956" - integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw== +which-typed-array@^1.1.16, which-typed-array@^1.1.19: + version "1.1.22" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.22.tgz#8f3cc78aefb40b437346dd40a1dbfa5d1da43fe9" + integrity sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw== dependencies: available-typed-arrays "^1.0.7" - call-bind "^1.0.8" + call-bind "^1.0.9" call-bound "^1.0.4" for-each "^0.3.5" get-proto "^1.0.1" @@ -4532,10 +4587,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@~8.17.1: - version "8.17.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" - integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== +ws@~8.21.0: + version "8.21.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.1.tgz#045650cd4b1207809e7547146223c3814a9af586" + integrity sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw== y18n@^5.0.5: version "5.0.8" @@ -4548,9 +4603,9 @@ yallist@^3.0.2: integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + version "1.10.3" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.3.tgz#76e407ed95c42684fb8e14641e5de62fe65bbcb3" + integrity sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA== yargs-parser@^20.2.2: version "20.2.9" @@ -4558,9 +4613,9 @@ yargs-parser@^20.2.2: integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs@^16.1.1: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + version "16.2.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.2.tgz#c56731dca0d2788ae0866dd3c83907d6bab85f7d" + integrity sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w== dependencies: cliui "^7.0.2" escalade "^3.1.1" @@ -4576,6 +4631,6 @@ yocto-queue@^0.1.0: integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== yocto-queue@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.0.tgz#4a29a93e7591328fa31768701e6ea66962401f79" - integrity sha512-KHBC7z61OJeaMGnF3wqNZj+GGNXOyypZviiKpQeiHirG5Ib1ImwcLBH70rbMSkKfSmUNBsdf2PwaEJtKvgmkNw== + version "1.2.2" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.2.tgz#3e09c95d3f1aa89a58c114c99223edf639152c00" + integrity sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==